diff --git a/legacy/device.te b/legacy/device.te
index b24e400f..a2563322 100644
--- a/legacy/device.te
+++ b/legacy/device.te
@@ -1,27 +1,3 @@
-# usbpd
-type logbuffer_device, dev_type;
-
 # Bt Wifi Coexistence device
 type wb_coexistence_dev, dev_type;
 
-# Touch
-type touch_offload_device, dev_type;
-
-# RLS device
-type rls_device, dev_type;
-
-# sensor direct DMA-BUF heap
-type sensor_direct_heap_device, dmabuf_heap_device_type, dev_type;
-
-#faceauth DMA-BUF heaps
-type faceauth_heap_device, dmabuf_heap_device_type, dev_type;
-
-#vframe-secure DMA-BUF heap
-type vframe_heap_device, dmabuf_heap_device_type, dev_type;
-
-#vscaler-secure DMA-BUF heap
-type vscaler_heap_device, dmabuf_heap_device_type, dev_type;
-
-# Fingerprint device
-type fingerprint_device, dev_type;
-
diff --git a/legacy/file.te b/legacy/file.te
index c608b956..c4b5d5cc 100644
--- a/legacy/file.te
+++ b/legacy/file.te
@@ -1,13 +1,10 @@
 # Exynos Data Files
 #type vendor_data_file, file_type, data_file_type;
 type vendor_cbd_boot_file, file_type, data_file_type;
-type vendor_media_data_file, file_type, data_file_type;
 
 # app data files
 type vendor_test_data_file, file_type, data_file_type;
 type vendor_telephony_data_file, file_type, data_file_type;
-type vendor_ims_data_file, file_type, data_file_type;
-type vendor_misc_data_file, file_type, data_file_type;
 type vendor_rpmbmock_data_file, file_type, data_file_type;
 
 # Exynos debugfs
@@ -18,8 +15,6 @@ type vendor_dri_debugfs, fs_type, debugfs_type;
 
 # Sensors
 type nanohub_lock_file, file_type, data_file_type;
-type sensor_vendor_data_file, file_type, data_file_type, mlstrustedobject;
-type sensors_cal_file, file_type;
 type sysfs_nanoapp_cmd, sysfs_type, fs_type;
 
 # Fingerprint
@@ -31,23 +26,12 @@ type sysfs_iommu, sysfs_type, fs_type;
 type sysfs_devicetree, sysfs_type, fs_type;
 type sysfs_mem, sysfs_type, fs_type;
 
-# ZRam
-type per_boot_file, file_type, data_file_type, core_data_file_type;
-
 # Touch
 type proc_touch, proc_type, fs_type, mlstrustedobject;
 
 # Wireless
 type sysfs_wlc, sysfs_type, fs_type;
 
-# Camera
-type persist_camera_file, file_type;
-type vendor_camera_tuning_file, vendor_file_type, file_type;
-type vendor_camera_data_file, file_type, data_file_type;
-
-# Display
-type persist_display_file, file_type, vendor_persist_type;
-
 # Charger
 type sysfs_chargelevel, sysfs_type, fs_type;
 
@@ -60,15 +44,3 @@ type sysfs_lhbm, sysfs_type, fs_type, mlstrustedobject;
 # UWB vendor
 type uwb_vendor_data_file, file_type, data_file_type, app_data_file_type;
 
-#
-# USF file SELinux type enforcements.
-#
-
-# Declare the sensor registry persist file type. By convention, persist file
-# types begin with "persist_".
-type persist_sensor_reg_file, file_type, vendor_persist_type;
-
-# Declare the sensor registry data file type. By convention, data file types
-# end with "data_file".
-type sensor_reg_data_file, file_type, data_file_type;
-
diff --git a/whitechapel_pro/device.te b/whitechapel_pro/device.te
index 57c41cd4..1f5e22ba 100644
--- a/whitechapel_pro/device.te
+++ b/whitechapel_pro/device.te
@@ -8,4 +8,12 @@ type modem_userdata_block_device, dev_type;
 type sg_device, dev_type;
 type vendor_toe_device, dev_type;
 type lwis_device, dev_type;
+type logbuffer_device, dev_type;
+type rls_device, dev_type;
+type touch_offload_device, dev_type;
+type fingerprint_device, dev_type;
+type sensor_direct_heap_device, dmabuf_heap_device_type, dev_type;
+type faceauth_heap_device, dmabuf_heap_device_type, dev_type;
+type vframe_heap_device, dmabuf_heap_device_type, dev_type;
+type vscaler_heap_device, dmabuf_heap_device_type, dev_type;
 
diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te
index a4f4692e..dea131d5 100644
--- a/whitechapel_pro/file.te
+++ b/whitechapel_pro/file.te
@@ -7,6 +7,11 @@ type vendor_slog_file, file_type, data_file_type;
 type radio_vendor_data_file, file_type, data_file_type;
 type updated_wifi_firmware_data_file, file_type, data_file_type;
 type tcpdump_vendor_data_file, file_type, data_file_type;
+type vendor_camera_data_file, file_type, data_file_type;
+type vendor_media_data_file, file_type, data_file_type;
+type vendor_misc_data_file, file_type, data_file_type;
+type sensor_reg_data_file, file_type, data_file_type;
+type per_boot_file, file_type, data_file_type, core_data_file_type;
 userdebug_or_eng(`
   typeattribute tcpdump_vendor_data_file mlstrustedobject;
   typeattribute vendor_slog_file mlstrustedobject;
@@ -51,6 +56,7 @@ allow modem_img_file self:filesystem associate;
 type persist_modem_file, file_type, vendor_persist_type;
 type persist_ss_file, file_type, vendor_persist_type;
 type persist_battery_file, file_type, vendor_persist_type;
+type persist_sensor_reg_file, file_type, vendor_persist_type;
 
 # CHRE
 type chre_socket, file_type;