diff --git a/target/config/config.fs b/target/config/config.fs
index 7d18aa06..f966a773 100644
--- a/target/config/config.fs
+++ b/target/config/config.fs
@@ -1,231 +1,3 @@
-[AID_VENDOR_QTI_DIAG]
-value:2901
-
-[AID_VENDOR_QDSS]
-value:2902
-
-[AID_VENDOR_RFS]
-value:2903
-
-[AID_VENDOR_RFS_SHARED]
-value:2904
-
-[AID_VENDOR_ADPL_ODL]
-value:2905
-
-[AID_VENDOR_QRTR]
-value:2906
-
-[AID_VENDOR_THERMAL]
-value:2907
-
-[AID_VENDOR_FASTRPC]
-value:2908
-
-[vendor/bin/wcnss_filter]
-mode: 0755
-user: AID_BLUETOOTH
-group: AID_BLUETOOTH
-caps: BLOCK_SUSPEND
-
-[system/vendor/bin/wcnss_filter]
-mode: 0755
-user: AID_BLUETOOTH
-group: AID_BLUETOOTH
-caps: BLOCK_SUSPEND
-
-[vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti]
-mode: 0755
-user: AID_BLUETOOTH
-group: AID_BLUETOOTH
-caps: BLOCK_SUSPEND NET_ADMIN
-
-[system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: BLOCK_SUSPEND NET_ADMIN
-
-[vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy]
-mode: 0755
-user: AID_BLUETOOTH
-group: AID_BLUETOOTH
-caps: BLOCK_SUSPEND NET_ADMIN
-
-[system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: BLOCK_SUSPEND NET_ADMIN
-
-[system/bin/cnss-daemon]
-mode: 0755
-user: AID_BLUETOOTH
-group: AID_BLUETOOTH
-caps: NET_BIND_SERVICE
-
-[vendor/bin/pm-service]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/pm-service]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[system/bin/pm-service]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[vendor/bin/pd-mapper]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/pd-mapper]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[system/bin/pd-mapper]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[vendor/bin/imsdatadaemon]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/imsdatadaemon]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[vendor/bin/ims_rtp_daemon]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/ims_rtp_daemon]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE
-
-[vendor/bin/imsrcsd]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
-
-[system/vendor/bin/imsrcsd]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
-
-[vendor/bin/imsdaemon]
-mode: 0755
-user: AID_RADIO
-group: AID_RADIO
-caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
-
-[vendor/bin/cnd]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
-
-[system/vendor/bin/cnd]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
-
-[vendor/bin/slim_daemon]
-mode: 0755
-user:  AID_GPS
-group: AID_GPS
-caps: NET_BIND_SERVICE
-
-[system/vendor/bin/slim_daemon]
-mode: 0755
-user:  AID_GPS
-group: AID_GPS
-caps: NET_BIND_SERVICE
-
-[vendor/bin/loc_launcher]
-mode: 0755
-user:  AID_GPS
-group: AID_GPS
-caps: SETUID SETGID
-
-[system/vendor/bin/loc_launcher]
-mode: 0755
-user:  AID_GPS
-group: AID_GPS
-caps: SETUID SETGID
-
-[vendor/bin/xtwifi-client]
-mode: 0755
-user:  AID_GPS
-group: AID_GPS
-caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
-
-[vendor/bin/sensors.qti]
-mode: 0755
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: NET_BIND_SERVICE
-
-[firmware/]
-mode: 0771
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: 0
-
-[firmware/image/*]
-mode: 0771
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: 0
-
-[vendor/firmware_mnt/image/*]
-mode: 0771
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: 0
-
-[bt_firmware/]
-mode: 0771
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: 0
-
-[persist/]
-mode: 0771
-user: AID_SYSTEM
-group: AID_SYSTEM
-caps: 0
-
-[dsp/]
-mode: 0771
-user: AID_MEDIA
-group: AID_MEDIA
-caps: 0
-
 [system/product/vendor_overlay/*/bin/*]
 mode: 0755
 user: AID_ROOT
diff --git a/target/config/permissions/privapp-permissions-qti.xml b/target/config/permissions/privapp-permissions-qti.xml
deleted file mode 100644
index 75f7f1bf..00000000
--- a/target/config/permissions/privapp-permissions-qti.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2017, The Linux Foundation. All rights reserved.
-
-  ~ Not a Contribution.
--->
-
-<!--
-  ~ Copyright (C) 2016 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<!--
-This XML file declares which signature|privileged permissions should be
-granted to privileged applications on QTI devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
-
-<permissions>
-    <privapp-permissions package="com.quicinc.cne.CNEService">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.PACKET_KEEPALIVE_OFFLOAD"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qti.dpmserviceapp">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.dialer">
-        <permission name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK"/>
-        <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
-        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>
-        <permission name="com.android.voicemail.permission.WRITE_VOICEMAIL"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.qti.qtiNetworkApp">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.ims">
-        <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.soundrecorder">
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.quicinc.voice.activation">
-        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
-        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
-        <permission name="android.permission.REBOOT"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.wfd.service">
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.android.mms">
-        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
-        <permission name="android.permission.WRITE_APN_SETTINGS"/>
-        <permission name="android.permission.CALL_PRIVILEGED"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.bluetooth.batestapp">
-        <permission name="android.permission.BLUETOOTH_PRIVILEGED"/>
-        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.snapcam">
-        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="org.codeaurora.gallery">
-        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qti.callenhancement">
-        <permission name="android.permission.RECORD_AUDIO" />
-        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
-        <permission name="android.permission.READ_EXTERNAL_STORAGE" />
-        <permission name="android.permission.WRITE_EXTERNAL_STORAGE" />
-        <permission name="android.permission.READ_BLOCKED_NUMBERS" />
-        <permission name="android.permission.VIBRATE" />
-    </privapp-permissions>
-</permissions>
diff --git a/target/config/permissions/qti_whitelist.xml b/target/config/permissions/qti_whitelist.xml
deleted file mode 100644
index c99da3f5..00000000
--- a/target/config/permissions/qti_whitelist.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-
-<!--
-/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
--->
-
-<config>
-    <!-- These are telephony components that need to freely run in the background -->
-    <allow-in-power-save package="com.qualcomm.atfwd" />
-    <allow-in-power-save package="com.qualcomm.qti.telephonyservice" />
-    <allow-in-power-save package="com.qualcomm.qcrilmsgtunnel" />
-    <allow-in-power-save package="com.qualcomm.qti.ims" />
-    <allow-in-power-save package="com.qualcomm.qti.radioconfiginterface" />
-    <allow-in-power-save package="com.qualcomm.simcontacts" />
-    <allow-in-power-save package="com.qualcomm.qti.autoregistration" />
-    <allow-in-power-save package="com.qualcomm.qti.server.wigigapp" />
-    <allow-in-power-save package="com.qualcomm.qti.gsma.services.nfc" />
-    <allow-in-power-save package="com.quicinc.voice.activation" />
-    <allow-in-power-save package="com.android.mms" />
-    <allow-in-power-save package="com.android.exchange" />
-    <allow-in-power-save package="com.android.email" />
-    <allow-in-power-save package="com.qualcomm.qti.callenhancement" />
-    <allow-in-power-save package="com.qualcomm.qti.smartassistant" />
-    <!-- These telephony applications need access to non-[System]SDK APIs -->
-    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteserver" />
-    <hidden-api-whitelisted-app package="com.qualcomm.uimremoteclient" />
-    <hidden-api-whitelisted-app package="com.qualcomm.atfwd" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.autoregistration" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.callenhancement" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.callfeaturessetting" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.confdialer" />
-    <hidden-api-whitelisted-app package="org.codeaurora.dialer" />
-    <hidden-api-whitelisted-app package="com.qti.qualcomm.datastatusnotification" />
-    <hidden-api-whitelisted-app package="com.qti.qualcomm.deviceinfo" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.modemtestmode" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.networksetting" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.qtisystemservice" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.telephonyservice" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.radioconfiginterface" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.radioconfigtest" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.roamingsettings" />
-    <hidden-api-whitelisted-app package="com.qualcomm.simcontacts" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.simsettings" />
-    <hidden-api-whitelisted-app package="org.codeaurora.ims" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.ims" />
-    <hidden-api-whitelisted-app package="com.qti.xdivert" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qcrilmsgtunnel" />
-    <hidden-api-whitelisted-app package="com.qti.confuridialer" />
-    <hidden-api-whitelisted-app package="com.qti.editnumber" />
-    <hidden-api-whitelisted-app package="com.qualcomm.embmstest" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.ltedirect" />
-    <hidden-api-whitelisted-app package="com.android.MultiplePdpTest" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.app" />
-    <hidden-api-whitelisted-app package="com.qualcomm.embms" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.embmstuneaway" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.uimlpatest" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.lpa" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.uim" />
-
-    <hidden-api-whitelisted-app package="org.codeaurora.snapcam" />
-    <hidden-api-whitelisted-app package="com.android.mms" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.carrierswitch" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.carrierconfigure" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.sva" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.smartassistant" />
-    <hidden-api-whitelisted-app package="com.quicinc.voice.activation" />
-    <hidden-api-whitelisted-app package="com.android.backup" />
-    <hidden-api-whitelisted-app package="com.android.contacts" />
-    <hidden-api-whitelisted-app package="com.android.exchange" />
-    <hidden-api-whitelisted-app package="com.android.soundrecorder" />
-    <hidden-api-whitelisted-app package="com.android.camera2" />
-    <hidden-api-whitelisted-app package="org.codeaurora.gallery" />
-    <hidden-api-whitelisted-app package="com.example.connmgr" />
-    <hidden-api-whitelisted-app package="com.android.email" />
-    <hidden-api-whitelisted-app package="com.cyanogenmod.filemanager" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.presenceappSub2" />
-    <hidden-api-whitelisted-app package="com.qualcomm.secureindicator" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.sysmonappExternal" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.biometrics.voiceprint.voiceprintdemo" />
-    <hidden-api-whitelisted-app package="com.qti.vtloopback " />
-    <hidden-api-whitelisted-app package="com.android.bluetooth" />
-    <hidden-api-whitelisted-app package="org.codeaurora.bluetooth" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.qmmi" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.perfdump" />
-    <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
-    <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
-    <hidden-api-whitelisted-app package="com.qualcomm.qti.server.wigigapp" />
-    <!-- These are location components that need to freely run in the background -->
-    <allow-in-power-save package="com.qualcomm.location" />
-    <allow-in-power-save package="com.qualcomm.location.XT" />
-    <allow-in-power-save package="com.qualcomm.location.XT.setup" />
-    <hidden-api-whitelisted-app package="com.qti.service.colorservice" />
-</config>
diff --git a/target/product/aospa-target.mk b/target/product/aospa-target.mk
index b9f5e0b7..c3ef3327 100644
--- a/target/product/aospa-target.mk
+++ b/target/product/aospa-target.mk
@@ -61,9 +61,7 @@ PRODUCT_VENDOR_MOVE_ENABLED := true
 
 # Permissions
 PRODUCT_COPY_FILES += \
-    vendor/aospa/target/config/permissions/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
     vendor/aospa/target/config/permissions/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml \
-    vendor/aospa/target/config/permissions/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/qti_whitelist.xml \
     vendor/aospa/target/config/permissions/lily_experience.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/lily_experience.xml
 
 # Sensitive phone numbers and APN configurations