diff --git a/sepolicy/vendor/dontaudit.te b/sepolicy/vendor/dontaudit.te
index ae4aca81..ad3325be 100644
--- a/sepolicy/vendor/dontaudit.te
+++ b/sepolicy/vendor/dontaudit.te
@@ -9,6 +9,7 @@ dontaudit crash_dump self:capability sys_admin;
 dontaudit extra_free_kbytes self:capability sys_admin;
 dontaudit fsck self:capability sys_admin;
 dontaudit hal_usb_default self:capability sys_admin;
+dontaudit hal_usb_qti self:capability sys_admin;
 dontaudit hal_wifi_supplicant_default self:capability sys_admin;
 dontaudit installd self:capability kill;
 dontaudit irsc_util self:capability sys_admin;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index 40d908d8..7f5a190e 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -95,9 +95,6 @@
 /data/vendor/thermal(/.*)?                                                                                                         u:object_r:thermal_data_file:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.thermal@2\.0-service\.mock                                                       u:object_r:hal_thermal_default_exec:s0
 
-# USB
-/vendor/bin/hw/android\.hardware\.usb\@1\.[0-3]-service-qti                                                                        u:object_r:hal_usb_default_exec:s0
-
 # Video4linux sysfs nodes
 /sys/devices/platform/soc/caa0000\.qcom,jpeg/video4linux/video1(/.*)?                                                              u:object_r:sysfs_graphics:s0
 
diff --git a/sepolicy/vendor/hal_usb_default.te b/sepolicy/vendor/hal_usb_default.te
deleted file mode 100644
index f7860cde..00000000
--- a/sepolicy/vendor/hal_usb_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-get_prop(hal_usb_default, vendor_usb_prop)
-set_prop(hal_usb_default, vendor_usb_prop)
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 54c364d8..5b2f03f1 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -100,7 +100,3 @@ rild.libpath				u:object_r:vendor_rild_libpath_prop:s0
 # Thermal engine
 persist.sys.thermal.                    u:object_r:thermal_engine_prop:s0
 sys.thermal.                            u:object_r:thermal_engine_prop:s0
-
-# USB
-vendor.sys.usb.                         u:object_r:vendor_usb_prop:s0
-ro.vendor.usb.                          u:object_r:vendor_usb_prop:s0