diff --git a/generic/vendor/common/file_contexts b/generic/vendor/common/file_contexts
index 4eba7a3..1786040 100644
--- a/generic/vendor/common/file_contexts
+++ b/generic/vendor/common/file_contexts
@@ -63,7 +63,7 @@
 /dev/hbtp_input                                 u:object_r:vendor_hbtp_device:s0
 /dev/hbtp_vm                                    u:object_r:vendor_hbtp_device:s0
 /dev/sg[0-9]+                                   u:object_r:vendor_sg_device:s0
-/dev/ufs-bsg*                                   u:object_r:vendor_bsg_device:s0
+/dev/ufs-bsg.*                                   u:object_r:vendor_bsg_device:s0
 /dev/0:0:0:49476                                u:object_r:vendor_bsg_device:s0
 /dev/sensors                                    u:object_r:sensors_device:s0
 /dev/mnh_sm                                     u:object_r:vendor_easel_device:s0
@@ -443,29 +443,13 @@
 /sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/devfreq/[a-f0-9]+.qcom,kgsl-3d0(/.*)? u:object_r:vendor_sysfs_kgsl:s0
 /sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpu_model u:object_r:vendor_sysfs_kgsl_gpu_model:s0
 /sys/devices(/platform)?/soc/[a-f0-9]+.qcom,kgsl-3d0/kgsl/kgsl-3d0/gpuclk u:object_r:vendor_sysfs_kgsl_gpuclk:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,usb-pdphy@[0-9]+/usbpd/usbpd[0-9](/.*)? u:object_r:vendor_sysfs_usbpd_device:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/usb(/.*)?        u:object_r:vendor_sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/pc_port(/.*)?    u:object_r:vendor_sysfs_usb_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.i2c/i2c-[0-9]+/[0-9]+-[0-9]+/[a-f0-9]+.i2c:qcom,[a-z0-9]+@[0-9]:qcom,smb[0-9]+-charger@[0-9]+/power_supply/parallel(/.*)?    u:object_r:vendor_sysfs_usb_supply:s0
+
 /sys/devices/soc/[a-f0-9]+.ssusb/power_supply/usb(/.*)?             u:object_r:vendor_sysfs_usb_supply:s0
 
 /data/(misc|vendor)/hbtp(/.*)?                                      u:object_r:vendor_hbtp_log_file:s0
 /vendor/etc/hbtp/*                                                  u:object_r:vendor_hbtp_cfg_file:s0
 
-/sys/devices/qpnp-charger.*/power_supply/battery(/.*)?              u:object_r:vendor_sysfs_battery_supply:s0
-# TODO: move this 2 line to target specfic file_contexts/genfs_context
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,qpnp-smb2/power_supply/battery(/.*)?    u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/[a-f0-9]+.qcom,spmi/spmi-[0-9]/spmi0-0[0-9]/[a-f0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qpnp,fg/power_supply/bms(/.*)?               u:object_r:vendor_sysfs_battery_supply:s0
-
-/sys/class/qcom-battery(/.*)?              u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/qpnp-linear-charger-[a-f0-9]+/power_supply/battery(/.*)?    u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices(/platform)?/soc/qpnp-vm-bms-[a-f0-9]+/power_supply/bms(/.*)?    u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/battery(/.*)?        u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-fg-[a-f0-9]+/power_supply/bms(/.*)?           u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices/soc/qpnp-smbcharger-[a-f0-9]+/power_supply/dc(/.*)?    u:object_r:vendor_sysfs_battery_supply:s0
-/sys/devices/soc/[a-f0-9]+.i2c/i2c-[0-9]/[0-9]-[a-f0-9]+/power_supply/parallel(/.*)?    u:object_r:vendor_sysfs_battery_supply:s0
-
-/sys/devices/soc/qpnp-vadc-[0-9]+(/.*)? u:object_r:vendor_sysfs_vadc_dev:s0
+/sys/devices/soc/qpnp-vadc-[0-9]+(/.*)?                             u:object_r:vendor_sysfs_vadc_dev:s0
 
 #Android NN Driver
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-qti   u:object_r:vendor_hal_neuralnetworks_default_exec:s0