diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1578781..2aa5c30 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -117,12 +117,7 @@ TARGET_USERIMAGES_USE_F2FS := true
 TARGET_USES_MKE2FS := true
 
 # Root
-BOARD_ROOT_EXTRA_FOLDERS := odm op1 op2
-BOARD_ROOT_EXTRA_SYMLINKS := \
-    /mnt/vendor/persist:/persist \
-    /vendor/bt_firmware:/bt_firmware \
-    /vendor/dsp:/dsp \
-    /vendor/firmware_mnt:/firmware
+BOARD_ROOT_EXTRA_FOLDERS := op1 op2 op_odm
 
 # Telephony
 TARGET_PROVIDES_QTI_TELEPHONY_JAR := true
diff --git a/sepolicy/private/file.te b/sepolicy/private/file.te
index 9d9f84e..2179ee9 100644
--- a/sepolicy/private/file.te
+++ b/sepolicy/private/file.te
@@ -1,10 +1,6 @@
 # rootfs
-type adsprpcd_file, file_type;
-type bt_firmware_file, file_type;
-type firmware_file, file_type;
 type op1_file, file_type;
 type op2_file, file_type;
-type persist_file, file_type;
 
 # proc
 type proc_touchpanel, fs_type, proc_type;
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index b6840d0..66557c5 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -2,12 +2,9 @@
 /data/misc/display(/.*)?      u:object_r:display_misc_file:s0
 
 # Files in rootfs
-/bt_firmware(/.*)?       u:object_r:bt_firmware_file:s0
-/dsp(/.*)?               u:object_r:adsprpcd_file:s0
-/firmware(/.*)?          u:object_r:firmware_file:s0
-/op1(/.*)?               u:object_r:op1_file:s0
-/op2(/.*)?               u:object_r:op2_file:s0
-/persist(/.*)?           u:object_r:persist_file:s0
+/op1(/.*)?       u:object_r:op1_file:s0
+/op2(/.*)?       u:object_r:op2_file:s0
+/op_odm(/.*)?    u:object_r:system_file:s0
 
 # Files in sysfs
 /sys/devices/platform/soc/soc:goodix_fp/proximity_state    u:object_r:sysfs_fpc_proximity:s0