diff --git a/legacy/hwservice.te b/legacy/hwservice.te
index edb3763c..5e36cd0c 100644
--- a/legacy/hwservice.te
+++ b/legacy/hwservice.te
@@ -1,12 +1,3 @@
-type hal_vendor_telephony_hwservice, hwservice_manager_type;
-type hal_vendor_surfaceflinger_hwservice, hwservice_manager_type;
-
-# rild service
-type hal_exynos_rild_hwservice, hwservice_manager_type;
-
 # Bluetooth HAL extension
 type hal_bluetooth_coexistence_hwservice, hwservice_manager_type, vendor_hwservice_type;
 
-# Fingerprint
-type hal_fingerprint_ext_hwservice, hwservice_manager_type;
-
diff --git a/legacy/hwservice_contexts b/legacy/hwservice_contexts
index 4895c5b3..df77e6f8 100644
--- a/legacy/hwservice_contexts
+++ b/legacy/hwservice_contexts
@@ -1,16 +1,5 @@
-vendor.samsung_slsi.hardware.radio::IOemSamsungslsi                   u:object_r:hal_telephony_hwservice:s0
-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
-
-# 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
-
 # Bluetooth HAL extension
 hardware.google.bluetooth.bt_channel_avoidance::IBTChannelAvoidance   u:object_r:hal_bluetooth_coexistence_hwservice:s0
 hardware.google.bluetooth.sar::IBluetoothSar                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
 hardware.google.bluetooth.ccc::IBluetoothCcc                          u:object_r:hal_bluetooth_coexistence_hwservice:s0
 
-# Fingerprint
-vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon  u:object_r:hal_fingerprint_ext_hwservice:s0
-
diff --git a/whitechapel_pro/hwservice.te b/whitechapel_pro/hwservice.te
index cdae523d..983e5a3f 100644
--- a/whitechapel_pro/hwservice.te
+++ b/whitechapel_pro/hwservice.te
@@ -7,3 +7,9 @@ type hal_radioext_hwservice, hwservice_manager_type;
 # WLC
 type hal_wlc_hwservice, hwservice_manager_type;
 
+# rild service
+type hal_exynos_rild_hwservice, hwservice_manager_type;
+
+# Fingerprint
+type hal_fingerprint_ext_hwservice, hwservice_manager_type;
+
diff --git a/whitechapel_pro/hwservice_contexts b/whitechapel_pro/hwservice_contexts
index ab89ba82..0035ed49 100644
--- a/whitechapel_pro/hwservice_contexts
+++ b/whitechapel_pro/hwservice_contexts
@@ -1,6 +1,9 @@
 # dmd HAL
 vendor.samsung_slsi.telephony.hardware.oemservice::IOemService                     u:object_r:hal_vendor_oem_hwservice:s0
 
+# Fingerprint
+vendor.goodix.hardware.biometrics.fingerprint::IGoodixFingerprintDaemon            u:object_r:hal_fingerprint_ext_hwservice:s0
+
 # Wireless charger hal
 vendor.google.wireless_charger::IWirelessCharger                                   u:object_r:hal_wlc_hwservice:s0
 
diff --git a/legacy/hwservicemanager.te b/whitechapel_pro/hwservicemanager.te
similarity index 100%
rename from legacy/hwservicemanager.te
rename to whitechapel_pro/hwservicemanager.te