diff --git a/legacy/domain.te b/legacy/domain.te
index 392e75c4..96283269 100644
--- a/legacy/domain.te
+++ b/legacy/domain.te
@@ -14,7 +14,6 @@ dontaudit domain fs_type:filesystem *;
 dontaudit domain dev_type:file *;
 dontaudit domain dev_type:chr_file *;
 dontaudit domain dev_type:blk_file *;
-dontaudit domain hwservice_manager_type:hwservice_manager *;
 dontaudit domain service_manager_type:service_manager *;
 dontaudit domain domain:capability *;
 dontaudit domain domain:binder *;
diff --git a/legacy/hwservice_contexts b/legacy/hwservice_contexts
index 9962c75d..d9777f05 100644
--- a/legacy/hwservice_contexts
+++ b/legacy/hwservice_contexts
@@ -2,11 +2,6 @@ vendor.samsung_slsi.hardware.radio::IOemSamsungslsi                   u:object_r
 vendor.samsung_slsi.hardware.ExynosHWCServiceTW::IExynosHWCServiceTW  u:object_r:hal_vendor_surfaceflinger_hwservice:s0
 vendor.samsung_slsi.hardware.configstore::IExynosHWCConfigs  u:object_r:hal_configstore_ISurfaceFlingerConfigs:s0
 
-# rild HAL
-vendor.samsung_slsi.telephony.hardware.radio::IOemSamsungslsi        u:object_r:hal_exynos_rild_hwservice:s0
-android.vendor.samsung_slsi.telephony.hardware.radio::IOemSamsungslsi        u:object_r:hal_exynos_rild_hwservice:s0
-vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0
-
 # VIDEO
 android.hardware.media.c2::IComponentStore                      u:object_r:hal_codec2_hwservice:s0
 android.hardware.media.c2::IConfigurable                        u:object_r:hal_codec2_hwservice:s0
diff --git a/legacy/bipchmgr.te b/whitechapel_pro/bipchmgr.te
similarity index 100%
rename from legacy/bipchmgr.te
rename to whitechapel_pro/bipchmgr.te
diff --git a/whitechapel_pro/hwservice_contexts b/whitechapel_pro/hwservice_contexts
index 45a0ec09..f89299c1 100644
--- a/whitechapel_pro/hwservice_contexts
+++ b/whitechapel_pro/hwservice_contexts
@@ -1,4 +1,5 @@
 # dmd HAL
-vendor.samsung_slsi.telephony.hardware.oemservice::IOemService  u:object_r:hal_vendor_oem_hwservice:s0
-
+vendor.samsung_slsi.telephony.hardware.oemservice::IOemService                     u:object_r:hal_vendor_oem_hwservice:s0
 
+# rild HAL
+vendor.samsung_slsi.telephony.hardware.radioExternal::IOemSlsiRadioExternal        u:object_r:hal_exynos_rild_hwservice:s0