diff --git a/radio/device.te b/radio/device.te
index f3df48ae..5d2afca4 100644
--- a/radio/device.te
+++ b/radio/device.te
@@ -1,4 +1,4 @@
+# radio
 type modem_block_device, dev_type;
 type vendor_gnss_device, dev_type;
-type modem_userdata_block_device, dev_type;
-type efs_block_device, dev_type;
+
diff --git a/vendor/device.te b/vendor/device.te
index 6ed4db3d..bbaa4c53 100644
--- a/vendor/device.te
+++ b/vendor/device.te
@@ -1,8 +1,7 @@
-type persist_block_device, dev_type;
+# Block Devices
 type tee_persist_block_device, dev_type;
 type custom_ab_block_device, dev_type;
 type mfg_data_block_device, dev_type;
-type ufs_internal_block_device, dev_type;
 type logbuffer_device, dev_type;
 type hw_jpg_device, dev_type, mlstrustedobject;
 type fingerprint_device, dev_type;
@@ -17,3 +16,4 @@ type gcma_camera_heap_device, dmabuf_heap_device_type, dev_type;
 
 # SecureElement SPI device
 type st54spi_device, dev_type;
+
diff --git a/vendor/file_contexts b/vendor/file_contexts
index d1a77738..444e96d8 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -22,7 +22,6 @@
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.rust\.trusty         u:object_r:hal_keymint_default_exec:s0
 /vendor/bin/hw/android\.hardware\.security\.secretkeeper\.trusty            u:object_r:hal_secretkeeper_default_exec:s0
-/vendor/bin/ufs_firmware_update\.sh                                         u:object_r:ufs_firmware_update_exec:s0
 /vendor/bin/hw/android\.hardware\.memtrack-service\.pixel                   u:object_r:hal_memtrack_default_exec:s0
 /vendor/bin/hw/disable_contaminant_detection\.sh                            u:object_r:disable-contaminant-detection-sh_exec:s0
 
diff --git a/vendor/ufs_firmware_update.te b/vendor/ufs_firmware_update.te
index 04e532e2..8fbb5d17 100644
--- a/vendor/ufs_firmware_update.te
+++ b/vendor/ufs_firmware_update.te
@@ -1,6 +1,4 @@
-type ufs_firmware_update, domain;
-type ufs_firmware_update_exec, vendor_file_type, exec_type, file_type;
-
+# ufs ffu
 userdebug_or_eng(`
   init_daemon_domain(ufs_firmware_update)
 
@@ -10,3 +8,4 @@ userdebug_or_eng(`
   allow ufs_firmware_update sysfs:dir r_dir_perms;
   allow ufs_firmware_update sysfs_scsi_devices_0000:file r_file_perms;
 ')
+