diff --git a/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml b/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml
deleted file mode 100755
index 4fdfb0a7..00000000
--- a/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This XML file declares which platform apps that need to access internal APIs.
--->
-<config>
-  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.okgoogle" />
-  <hidden-api-whitelisted-app package="com.android.hotwordenrollment.xgoogle" />
-</config>
diff --git a/configs/privapp-permission/privapp-permissions-qti-system.xml b/configs/privapp-permission/privapp-permissions-qti-system.xml
index 716d4d19..b5f9dea8 100644
--- a/configs/privapp-permission/privapp-permissions-qti-system.xml
+++ b/configs/privapp-permission/privapp-permissions-qti-system.xml
@@ -180,9 +180,4 @@ It allows additional grants on top of privapp-permissions-platform.xml
       <permission name="android.permission.INTERACT_ACROSS_USERS" />
       <permission name="android.permission.READ_FRAME_BUFFER"/>
     </privapp-permissions>
-    
-    <privapp-permissions package="com.android.hotwordenrollment.common.util">
-      <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-      <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-    </privapp-permissions>
 </permissions>
diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml
index f75f7270..f2069d00 100755
--- a/configs/qti_whitelist.xml
+++ b/configs/qti_whitelist.xml
@@ -32,7 +32,6 @@
 
 <config>
     <!-- These are telephony components that need to freely run in the background -->
-    <allow-in-power-save package="com.android.hotwordenrollment.common.util" />
     <allow-in-power-save package="com.qualcomm.atfwd" />
     <allow-in-power-save package="com.qualcomm.location" />
     <allow-in-power-save package="com.qualcomm.location.XT" />
@@ -54,7 +53,6 @@
     <allow-in-power-save package="com.skyhook.blp" />
     <allow-in-power-save package="org.lineageos.settings.device" />
     <!-- These telephony applications need access to non-[System]SDK APIs -->
-    <hidden-api-whitelisted-app package="com.android.hotwordenrollment.common.util" />
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />
     <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />
     <hidden-api-whitelisted-app package="com.qualcomm.atfwd" />
diff --git a/proprietary-files.txt b/proprietary-files.txt
index c0b8c2c7..ba5ea444 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -416,12 +416,6 @@ vendor/lib64/libsdmextension.so|913503f002aa2afbeca90d429bac4bff4a2266e0
 vendor/lib/hw/vulkan.sdm660.so|976dc51608ebdbed8ced26809e3b776c47695c39
 vendor/lib64/hw/vulkan.sdm660.so|0b282ec0dc482134fd0ba168cd367a8a008ceb5f
 
-# HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk|1cbc6ae6490cfc6e16619773809b9afcc9998f91;PRESIGNED
--product/priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk|24b4885a1f9194c65f378a2afd8e08b4b11842d8;PRESIGNED
--system_ext/framework/com.android.hotwordenrollment.common.util.jar|bef92589e75a6da6043f85f4b9b0e85866429624
-system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml|563a58554d9c0dd0608552b644fbf74519a447bb
-
 # IRQ balance - from LA.UM.8.2.r1-07400-sdm660.0
 vendor/bin/msm_irqbalance|0e967f5c7eaf8d863a50996459101be47adf96a2
 
diff --git a/sdm660.mk b/sdm660.mk
index a4cfb39d..05cd36c2 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -463,10 +463,9 @@ PRODUCT_PACKAGES += \
 
 # Privapp-Permissions
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/privapp-permission/hotword-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/hotword-hiddenapi-package-whitelist.xml \
-    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml \
     $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml \
-    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    $(COMMON_PATH)/configs/privapp-permission/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml
 
 # Public Libraries
 PRODUCT_COPY_FILES += \