diff --git a/legacy/file.te b/legacy/file.te
index e55ad46..4d8c9e0 100644
--- a/legacy/file.te
+++ b/legacy/file.te
@@ -73,9 +73,6 @@
 type proc_touch, proc_type, fs_type, mlstrustedobject;
 type sysfs_touch, sysfs_type, fs_type;
 
-# RILD
-type rild_vendor_data_file, file_type, data_file_type;
-
 # TCP logging
 type tcpdump_vendor_data_file, file_type, data_file_type, mlstrustedobject;
 
diff --git a/legacy/file_contexts b/legacy/file_contexts
index cc27763..675299d 100644
--- a/legacy/file_contexts
+++ b/legacy/file_contexts
@@ -61,13 +61,6 @@
 /dev/mali0                     u:object_r:gpu_device:s0
 /dev/s5p-smem                  u:object_r:vendor_secmem_device:s0
 
-#
-# Exynos Daemon Exec
-#
-/(vendor|system/vendor)/bin/hw/rild_exynos     u:object_r:rild_exec:s0
-/(vendor|system/vendor)/bin/rfsd               u:object_r:rfsd_exec:s0
-/(vendor|system/vendor)/bin/bipchmgr           u:object_r:bipchmgr_exec:s0
-
 /persist/sensorcal\.json     u:object_r:sensors_cal_file:s0
 
 # data files
@@ -213,9 +206,6 @@
 # R4
 /vendor/bin/hw/hardware\.qorvo\.uwb-service                          u:object_r:hal_uwb_vendor_default_exec:s0
 
-# RILD files
-/data/vendor/rild(/.*)?                                                     u:object_r:rild_vendor_data_file:s0
-
 # Citadel StrongBox
 /dev/gsc0                                                                   u:object_r:citadel_device:s0
 
diff --git a/legacy/property.te b/legacy/property.te
index 4a7c01c..a66a947 100644
--- a/legacy/property.te
+++ b/legacy/property.te
@@ -7,8 +7,6 @@
 vendor_internal_prop(vendor_secure_element_prop)
 # vendor defaults
 vendor_internal_prop(vendor_config_default_prop)
-vendor_internal_prop(vendor_ro_config_default_prop)
-vendor_internal_prop(vendor_sys_default_prop)
 vendor_internal_prop(vendor_ro_sys_default_prop)
 vendor_internal_prop(vendor_persist_sys_default_prop)
 vendor_internal_prop(vendor_codec2_debug_prop)
diff --git a/legacy/property_contexts b/legacy/property_contexts
index ba12f0e..7244e74 100644
--- a/legacy/property_contexts
+++ b/legacy/property_contexts
@@ -26,8 +26,6 @@
 
 # vendor default
 vendor.config.               u:object_r:vendor_config_default_prop:s0
-ro.vendor.config.            u:object_r:vendor_ro_config_default_prop:s0
-vendor.sys.                  u:object_r:vendor_sys_default_prop:s0
 ro.vendor.sys.               u:object_r:vendor_ro_sys_default_prop:s0
 persist.vendor.sys.          u:object_r:vendor_persist_sys_default_prop:s0
 
diff --git a/legacy/vendor_init.te b/legacy/vendor_init.te
index b2e53a8..94b7d9e 100644
--- a/legacy/vendor_init.te
+++ b/legacy/vendor_init.te
@@ -3,9 +3,7 @@
 set_prop(vendor_init, vendor_rild_prop)
 set_prop(vendor_init, vendor_usb_config_prop)
 set_prop(vendor_init, vendor_slog_prop)
-set_prop(vendor_init, vendor_sys_default_prop)
 set_prop(vendor_init, vendor_ssrdump_prop)
-set_prop(vendor_init, vendor_ro_config_default_prop)
 get_prop(vendor_init, vendor_touchpanel_prop)
 set_prop(vendor_init, vendor_tcpdump_log_prop)
 set_prop(vendor_init, vendor_thermal_prop)
diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te
index 75fd4ee..923cdc6 100644
--- a/whitechapel_pro/file.te
+++ b/whitechapel_pro/file.te
@@ -1,4 +1,5 @@
 # Data
+type rild_vendor_data_file, file_type, data_file_type;
 type vendor_log_file, file_type, data_file_type;
 type vendor_rfsd_log_file, file_type, data_file_type;
 type modem_stat_data_file, file_type, data_file_type;
diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts
index 346eb11..72ce51e 100644
--- a/whitechapel_pro/file_contexts
+++ b/whitechapel_pro/file_contexts
@@ -6,6 +6,9 @@
 /vendor/bin/chre                                              u:object_r:chre_exec:s0
 /vendor/bin/cbd                                               u:object_r:cbd_exec:s0
 /vendor/bin/modem_svc_sit                                     u:object_r:modem_svc_sit_exec:s0
+/vendor/bin/hw/rild_exynos                                    u:object_r:rild_exec:s0
+/vendor/bin/rfsd                                              u:object_r:rfsd_exec:s0
+/vendor/bin/bipchmgr                                          u:object_r:bipchmgr_exec:s0
 
 # Vendor Firmwares
 /vendor/firmware(/.*)?                                        u:object_r:vendor_fw_file:s0
@@ -58,6 +61,7 @@
 /data/vendor/modem_stat/debug\.txt                            u:object_r:modem_stat_data_file:s0
 /data/vendor/log(/.*)?                                        u:object_r:vendor_log_file:s0
 /data/vendor/log/rfsd(/.*)?                                   u:object_r:vendor_rfsd_log_file:s0
+/data/vendor/rild(/.*)?                                       u:object_r:rild_vendor_data_file:s0
 
 # Persist
 /mnt/vendor/persist/modem(/.*)?                               u:object_r:persist_modem_file:s0
diff --git a/whitechapel_pro/property.te b/whitechapel_pro/property.te
index b929842..3c80661 100644
--- a/whitechapel_pro/property.te
+++ b/whitechapel_pro/property.te
@@ -4,4 +4,5 @@
 vendor_internal_prop(vendor_persist_config_default_prop)
 vendor_internal_prop(vendor_cbd_prop)
 vendor_internal_prop(vendor_rild_prop)
+vendor_internal_prop(vendor_carrier_prop)
 
diff --git a/whitechapel_pro/property_contexts b/whitechapel_pro/property_contexts
index 8184dca..f2af032 100644
--- a/whitechapel_pro/property_contexts
+++ b/whitechapel_pro/property_contexts
@@ -26,5 +26,6 @@
 vendor.ril.                      u:object_r:vendor_rild_prop:s0
 vendor.radio.ril.                u:object_r:vendor_rild_prop:s0
 vendor.sys.rild_reset            u:object_r:vendor_rild_prop:s0
+ro.vendor.config.build_carrier   u:object_r:vendor_carrier_prop:s0
 
 persist.vendor.config.           u:object_r:vendor_persist_config_default_prop:s0
diff --git a/legacy/rild.te b/whitechapel_pro/rild.te
similarity index 78%
rename from legacy/rild.te
rename to whitechapel_pro/rild.te
index 5dab0ef..5f049d0 100644
--- a/legacy/rild.te
+++ b/whitechapel_pro/rild.te
@@ -1,8 +1,5 @@
 set_prop(rild, vendor_rild_prop)
-
-get_prop(rild, vendor_persist_config_default_prop)
-get_prop(rild, vendor_ro_config_default_prop)
-set_prop(rild, vendor_sys_default_prop)
+get_prop(rild, vendor_carrier_prop)
 
 get_prop(rild, sota_prop)
 get_prop(rild, system_boot_reason_prop)
@@ -20,10 +17,7 @@
 binder_call(rild, bipchmgr)
 binder_call(rild, gpsd)
 binder_call(rild, hal_audio_default)
-binder_call(rild, hal_secure_element_default)
-binder_call(rild, platform_app)
 binder_call(rild, modem_svc_sit)
-binder_call(rild, vendor_ims_app)
 
 # for hal service
 add_hwservice(rild, hal_exynos_rild_hwservice)
diff --git a/whitechapel_pro/vendor_init.te b/whitechapel_pro/vendor_init.te
index 250d228..f0c6b6b 100644
--- a/whitechapel_pro/vendor_init.te
+++ b/whitechapel_pro/vendor_init.te
@@ -1,3 +1,4 @@
 allow vendor_init bootdevice_sysdev:file create_file_perms;
 
+set_prop(vendor_init, vendor_carrier_prop)
 set_prop(vendor_init, vendor_cbd_prop)