diff --git a/whitechapel_pro/file.te b/whitechapel_pro/file.te
index de840a73..d114d26e 100644
--- a/whitechapel_pro/file.te
+++ b/whitechapel_pro/file.te
@@ -46,7 +46,6 @@ type sysfs_camera, sysfs_type, fs_type;
 type sysfs_write_leds, sysfs_type, fs_type;
 
 # debugfs
-type debugfs_f2fs, debugfs_type, fs_type;
 type vendor_maxfg_debugfs, fs_type, debugfs_type;
 type vendor_pm_genpd_debugfs, fs_type, debugfs_type;
 type vendor_regmap_debugfs, fs_type, debugfs_type;
diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts
index a5d19ab8..43121b3e 100644
--- a/whitechapel_pro/file_contexts
+++ b/whitechapel_pro/file_contexts
@@ -22,9 +22,9 @@
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/vendor\.google\.radioext@1\.0-service                        u:object_r:hal_radioext_default_exec:s0
 /vendor/bin/hw/android\.hardware\.contexthub-service\.generic               u:object_r:hal_contexthub_default_exec:s0
-/vendor/bin/hw/android\.hardware\.boot@1\.2-service-zuma                   u:object_r:hal_bootctl_default_exec:s0
+/vendor/bin/hw/android\.hardware\.boot@1\.2-service-zuma                    u:object_r:hal_bootctl_default_exec:s0
 /vendor/bin/hw/android\.hardware\.composer\.hwc3-service\.pixel             u:object_r:hal_graphics_composer_default_exec:s0
-/vendor/bin/hw/android\.hardware\.dumpstate@1\.1-service\.zuma             u:object_r:hal_dumpstate_default_exec:s0
+/vendor/bin/hw/android\.hardware\.dumpstate-service\.zuma                   u:object_r:hal_dumpstate_default_exec:s0
 /vendor/bin/hw/samsung\.hardware\.media\.c2@1\.2-service                    u:object_r:mediacodec_samsung_exec:s0
 /vendor/bin/hw/google\.hardware\.media\.c2@2\.0-service                     u:object_r:mediacodec_google_exec:s0
 /vendor/bin/hw/android\.hardware\.secure_element@1\.2-service-gto           u:object_r:hal_secure_element_st54spi_exec:s0
@@ -66,7 +66,6 @@
 /vendor/lib(64)?/libgpudataproducer\.so                                     u:object_r:same_process_hal_file:s0
 
 # Devices
-/dev/trusty-log0                                                            u:object_r:logbuffer_device:s0
 /dev/dma_heap/sensor_direct_heap                                            u:object_r:sensor_direct_heap_device:s0
 /dev/ttySAC0                                                                u:object_r:tty_device:s0
 /dev/dma_heap/faceauth_tpu-secure                                           u:object_r:faceauth_heap_device:s0
diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts
index a1ea68d5..6ccf7b70 100644
--- a/whitechapel_pro/genfs_contexts
+++ b/whitechapel_pro/genfs_contexts
@@ -4,12 +4,6 @@ genfscon sysfs /devices/platform/exynos-bts/bts_stats                          u
 
 genfscon sysfs /firmware/devicetree/base/chosen                                u:object_r:sysfs_chosen:s0
 genfscon sysfs /devices/virtual/pmic/mitigation                                u:object_r:sysfs_bcl:s0
-genfscon sysfs /devices/system/chip-id/ap_hw_tune_str                          u:object_r:sysfs_chip_id:s0
-genfscon sysfs /devices/system/chip-id/evt_ver                                 u:object_r:sysfs_chip_id:s0
-genfscon sysfs /devices/system/chip-id/lot_id                                  u:object_r:sysfs_chip_id:s0
-genfscon sysfs /devices/system/chip-id/product_id                              u:object_r:sysfs_chip_id:s0
-genfscon sysfs /devices/system/chip-id/revision                                u:object_r:sysfs_chip_id:s0
-genfscon sysfs /devices/system/chip-id/raw_str                                 u:object_r:sysfs_chip_id:s0
 
 # CPU
 genfscon sysfs /devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/time_in_state       u:object_r:sysfs_cpu:s0
@@ -156,7 +150,6 @@ genfscon sysfs /devices/platform/13200000.ufs/ufs_stats                 u:object
 genfscon sysfs /devices/platform/13200000.ufs/attributes/wb_avail_buf   u:object_r:sysfs_scsi_devices_0000:s0
 
 # debugfs
-genfscon debugfs /f2fs                                                  u:object_r:debugfs_f2fs:s0
 genfscon debugfs /maxfg                                                 u:object_r:vendor_maxfg_debugfs:s0
 genfscon debugfs /dma_buf/bufinfo                                       u:object_r:vendor_dmabuf_debugfs:s0
 genfscon debugfs /pm_genpd/pm_genpd_summary                             u:object_r:vendor_pm_genpd_debugfs:s0