diff --git a/tracking_denials/bug_map b/tracking_denials/bug_map
index a81c684d..e499aaa4 100644
--- a/tracking_denials/bug_map
+++ b/tracking_denials/bug_map
@@ -1,4 +1,5 @@
 
+battery_mitigation sysfs file b/364446534
 chre vendor_data_file dir b/301948771
 dump_display sysfs file b/340722772
 hal_power_default hal_power_default capability b/240632824
diff --git a/whitechapel/vendor/google/device.te b/whitechapel/vendor/google/device.te
index 1399788a..1e1f25db 100644
--- a/whitechapel/vendor/google/device.te
+++ b/whitechapel/vendor/google/device.te
@@ -1,8 +1,5 @@
 # Block Devices
-type efs_block_device, dev_type;
 type modem_block_device, dev_type;
-type modem_userdata_block_device, dev_type;
-type persist_block_device, dev_type;
 type mfg_data_block_device, dev_type;
 
 # Exynos devices
@@ -40,6 +37,3 @@ type st33spi_device, dev_type;
 # GPS
 type vendor_gnss_device, dev_type;
 
-# Storage firmware upgrade
-type ufs_internal_block_device, dev_type;
-
diff --git a/whitechapel/vendor/google/file.te b/whitechapel/vendor/google/file.te
index ed633c69..db4d0570 100644
--- a/whitechapel/vendor/google/file.te
+++ b/whitechapel/vendor/google/file.te
@@ -75,10 +75,6 @@ type proc_f2fs, proc_type, fs_type;
 
 type bootdevice_sysdev, dev_type;
 
-# Storage firmware upgrade
-type ufs_firmware_update, domain;
-type ufs_firmware_update_exec, vendor_file_type, exec_type, file_type;
-
 # ZRam
 type per_boot_file, file_type, data_file_type, core_data_file_type;
 
@@ -165,3 +161,4 @@ type sysfs_bootctl, sysfs_type, fs_type;
 
 # WLC
 type sysfs_wlc, sysfs_type, fs_type;
+