diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index 24d8957..31d6f08 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -75,17 +75,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "QCC-TR-UI",
-	owner: "asus",
-	apk: "proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk",
-	presigned: true,
-	dex_preopt: {
-		enabled: false,
-	},
-	soc_specific: true,
-}
-
 android_app_import {
 	name: "TimeService",
 	owner: "asus",
@@ -97,50 +86,6 @@ android_app_import {
 	soc_specific: true,
 }
 
-android_app_import {
-	name: "CallFeaturesSetting",
-	owner: "asus",
-	apk: "proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	product_specific: true,
-}
-
-android_app_import {
-	name: "ConfURIDialer",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "ConferenceDialer",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "DeviceInfo",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "DeviceStatisticsService",
 	owner: "asus",
@@ -152,39 +97,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "DynamicDDSService",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "NetworkSetting",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "QTIDiagServices",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "QtiTelephonyService",
 	owner: "asus",
@@ -196,61 +108,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "SimContact",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/SimContact/SimContact.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "SimSettings",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/SimSettings/SimSettings.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "atfwd",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/atfwd/atfwd.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "embms",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/embms/embms.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
-android_app_import {
-	name: "imssettings",
-	owner: "asus",
-	apk: "proprietary/system_ext/app/imssettings/imssettings.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "remoteSimLockAuthentication",
 	owner: "asus",
@@ -339,18 +196,6 @@ android_app_import {
 	system_ext_specific: true,
 }
 
-android_app_import {
-	name: "QAS_DVC_MSP",
-	owner: "asus",
-	apk: "proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk",
-	certificate: "platform",
-	dex_preopt: {
-		enabled: false,
-	},
-	privileged: true,
-	system_ext_specific: true,
-}
-
 android_app_import {
 	name: "dpmserviceapp",
 	owner: "asus",
@@ -505,13 +350,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "embmslibrary",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/embmslibrary.jar"],
-	system_ext_specific: true,
-}
-
 dex_import {
 	name: "qcrilhook",
 	owner: "asus",
@@ -778,13 +616,6 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "vendor.qti.latency-V2.1-java",
-	owner: "asus",
-	jars: ["proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar"],
-	system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
 	name: "manifest_android.hardware.drm@1.3-service.widevine",
 	owner: "asus",
diff --git a/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk b/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk
deleted file mode 100755
index 3cf7867..0000000
Binary files a/sdm660-common/proprietary/product/app/CallFeaturesSetting/CallFeaturesSetting.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml b/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
deleted file mode 100644
index 045550c..0000000
--- a/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2019 Qualcomm Technologies, Inc.
-  ~ All Rights Reserved.
-  ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!--
-  ~ 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="org.codeaurora.qti.qtiNetworkApp">
-        <permission name="android.permission.MODIFY_PHONE_STATE"/>
-    </privapp-permissions>
-
-    <privapp-permissions package="com.qualcomm.qti.carrierswitch">
-        <permission name="android.permission.REBOOT"/>
-    </privapp-permissions>
-
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk b/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk
deleted file mode 100755
index 468ca13..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/ConfURIDialer/ConfURIDialer.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk b/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk
deleted file mode 100755
index b347fd9..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/ConferenceDialer/ConferenceDialer.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk b/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk
deleted file mode 100755
index 187daea..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/DeviceInfo/DeviceInfo.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk b/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk
deleted file mode 100755
index 93eab85..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/DynamicDDSService/DynamicDDSService.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk b/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk
deleted file mode 100755
index 3ade1bf..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/NetworkSetting/NetworkSetting.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk b/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk
deleted file mode 100644
index 7f73da2..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/QTIDiagServices/QTIDiagServices.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk b/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk
deleted file mode 100644
index 75614e0..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/SimContact/SimContact.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk b/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk
deleted file mode 100644
index 3c0f97d..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/SimSettings/SimSettings.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk b/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk
deleted file mode 100755
index 1e9ad6c..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/atfwd/atfwd.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/embms/embms.apk b/sdm660-common/proprietary/system_ext/app/embms/embms.apk
deleted file mode 100755
index c8ec4cb..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/embms/embms.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk b/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk
deleted file mode 100755
index 719ee08..0000000
Binary files a/sdm660-common/proprietary/system_ext/app/imssettings/imssettings.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system b/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system
deleted file mode 100755
index 9628d06..0000000
Binary files a/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system b/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system
deleted file mode 100755
index 11071fa..0000000
Binary files a/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system b/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system
deleted file mode 100755
index 42e4108..0000000
Binary files a/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/bin/test_diag_system b/sdm660-common/proprietary/system_ext/bin/test_diag_system
deleted file mode 100755
index e567b50..0000000
Binary files a/sdm660-common/proprietary/system_ext/bin/test_diag_system and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml
deleted file mode 100644
index 0801b79..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2017 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="com.qualcomm.qti.imscmservice@1.0-java"
-            file="/system/framework/com.qualcomm.qti.imscmservice@1.0-java.jar" />
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml b/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
deleted file mode 100644
index c7d2f8e..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2019 Qualcomm Technologies, Inc.
-  ~ All Rights Reserved.
-  ~ Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!--
-  ~ 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.qti.ltebc">
-        <permission name="android.permission.SEND_EMBMS_INTENTS"/>
-    </privapp-permissions>
-
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/embms.xml b/sdm660-common/proprietary/system_ext/etc/permissions/embms.xml
deleted file mode 100644
index 941d4f3..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/embms.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
- <library name="com.qualcomm.embmslibrary"
-          file="/system_ext/framework/embmslibrary.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml b/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
deleted file mode 100644
index 6fe1cd2..0000000
--- a/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2014 Qualcomm Technologies, Inc.  All Rights Reserved.
-Qualcomm Technologies Proprietary and Confidential.
--->
-
-<permissions>
-<library name="com.qualcomm.qti.QtiTelephonyServicelibrary"
-         file="/system/system_ext/framework/QtiTelephonyServicelibrary.jar"/>
-</permissions>
diff --git a/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar b/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar
deleted file mode 100644
index d627365..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/embmslibrary.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar b/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar
deleted file mode 100644
index a3ab5f7..0000000
Binary files a/sdm660-common/proprietary/system_ext/framework/vendor.qti.latency-V2.1-java.jar and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so b/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so
deleted file mode 100755
index bb61a4a..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so
deleted file mode 100755
index 37aa1e1..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so
deleted file mode 100755
index c244363..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so
deleted file mode 100755
index 4d3eced..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libDiagService.so b/sdm660-common/proprietary/system_ext/lib64/libDiagService.so
deleted file mode 100644
index fe5f123..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libDiagService.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libadsprpc_system.so b/sdm660-common/proprietary/system_ext/lib64/libadsprpc_system.so
deleted file mode 100755
index be3b122..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libadsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libcdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib64/libcdsprpc_system.so
deleted file mode 100755
index 80812a1..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libcdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so b/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so
deleted file mode 100644
index 42f514a..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so b/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so
deleted file mode 100644
index 833c8bf..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib64/libmdsprpc_system.so
deleted file mode 100755
index 5cc4ed3..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so b/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so
deleted file mode 100644
index 5c02cbf..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so b/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so
deleted file mode 100644
index c416dfc..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libmsp.so b/sdm660-common/proprietary/system_ext/lib64/libmsp.so
deleted file mode 100644
index b67b1aa..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libmsp.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so b/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so
deleted file mode 100755
index d0b42a0..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so b/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so
deleted file mode 100644
index 61e7adc..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so b/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so
deleted file mode 100644
index 9d8680c..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so
deleted file mode 100644
index 8d03a70..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so
deleted file mode 100644
index 9236a47..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so
deleted file mode 100644
index c023fa7..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so
deleted file mode 100644
index 154b6e2..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so
deleted file mode 100644
index dfebb6a..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so
deleted file mode 100644
index 6ba7edf..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so
deleted file mode 100644
index a3c1c76..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so
deleted file mode 100644
index b10878a..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so b/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so
deleted file mode 100644
index 35e1fca..0000000
Binary files a/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk b/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk
deleted file mode 100644
index 721587d..0000000
Binary files a/sdm660-common/proprietary/system_ext/priv-app/QAS_DVC_MSP/QAS_DVC_MSP.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk b/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk
deleted file mode 100644
index 891b84c..0000000
Binary files a/sdm660-common/proprietary/vendor/app/QCC-TR-UI/QCC-TR-UI.apk and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/ATFWD-daemon b/sdm660-common/proprietary/vendor/bin/ATFWD-daemon
deleted file mode 100755
index 13dd01b..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/ATFWD-daemon and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
deleted file mode 100755
index 3f7cdbf..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
deleted file mode 100755
index f25a195..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.factory@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
deleted file mode 100755
index 5d13686..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.factory@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service
deleted file mode 100755
index 642cc4f..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
deleted file mode 100755
index f0073c0..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/mmid b/sdm660-common/proprietary/vendor/bin/mmid
deleted file mode 100755
index e0df45f..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/mmid and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/mutualex b/sdm660-common/proprietary/vendor/bin/mutualex
deleted file mode 100755
index ad6dc21..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/mutualex and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/nqnfcinfo b/sdm660-common/proprietary/vendor/bin/nqnfcinfo
deleted file mode 100755
index a031425..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/nqnfcinfo and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/qcc-trd b/sdm660-common/proprietary/vendor/bin/qcc-trd
deleted file mode 100755
index fcd6b3a..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/qcc-trd and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/qmipriod b/sdm660-common/proprietary/vendor/bin/qmipriod
deleted file mode 100755
index 1656783..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/qmipriod and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/qrtr-lookup b/sdm660-common/proprietary/vendor/bin/qrtr-lookup
deleted file mode 100755
index e6e67f4..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/qrtr-lookup and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/ssgtzd b/sdm660-common/proprietary/vendor/bin/ssgtzd
deleted file mode 100755
index 482bc63..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/ssgtzd and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision b/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision
deleted file mode 100755
index bc707c5..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/etc/init/dpmQmiMgr.rc b/sdm660-common/proprietary/vendor/etc/init/dpmQmiMgr.rc
deleted file mode 100644
index aeb6c5b..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/dpmQmiMgr.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-#start dpmQmiMgr service
-service dpmQmiMgr /system/vendor/bin/dpmQmiMgr
-    interface com.qualcomm.qti.dpm.api@1.0::IdpmQmi dpmQmiService
-    class main
-    user system
-    group system
-    disabled
-
-on property:persist.vendor.dpmhalservice.enable=*
-   start dpmQmiMgr
-
-on property:persist.vendor.dpmhalservice.enable=0
-   stop dpmQmiMgr
diff --git a/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc b/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc
deleted file mode 100644
index 120e8d1..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-on post-fs-data
-    # create QDMA dropbox
-    mkdir /data/vendor/qdmastats 0700 system system
-    mkdir /data/vendor/qdma 0770 system system
-    #mkdir /dev/socket/qdma 0777 system system
-    #chmod 2777 /dev/socket/qdma
-
-service vendor.qcc-trd /system/vendor/bin/qcc-trd
-    class late_start
-    user system
-    group everybody readproc system net_bw_stats radio vendor_rfs_shared sdcard_rw media_rw sdcard_r
diff --git a/sdm660-common/proprietary/vendor/etc/init/mutualex.rc b/sdm660-common/proprietary/vendor/etc/init/mutualex.rc
deleted file mode 100644
index f93172e..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/mutualex.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-service vendor.mutualex /vendor/bin/mutualex
-     class main
-     user radio
-     group radio wakelock wifi inet
-     capabilities BLOCK_SUSPEND
-     oneshot
diff --git a/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc b/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc
deleted file mode 100644
index 1555a09..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-on boot
-    write /data/vendor/qmipriod/log.txt ""
-    chown radio radio /data/vendor/qmipriod/log.txt
diff --git a/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc b/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc
deleted file mode 100644
index 909fba0..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-service vendor.qmipriod /system/vendor/bin/qmipriod
-    class main
-    user radio
-    group radio
-    disabled
-
-on property:persist.vendor.data.qmipriod_load=1
-    start vendor.qmipriod
-
-on property:persist.vendor.data.qmipriod_load=0
-    stop vendor.qmipriod
-
-on post-fs-data
-    #Create logging directory
-    mkdir /data/vendor/qmipriod 0770 radio radio
-    chmod 0770 /data/vendor/qmipriod
diff --git a/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc b/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc
deleted file mode 100644
index 1db24c7..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-
-# Create the directories used by qwes
-on post-fs-data
-    mkdir /data/vendor/qwes 0755 system system
-
-# Start daemon after boot completed
-on property:sys.boot_completed=1
-    start vendor.ssgtzd
-
-# Used 'disabled' flag, so daemon won't be started until explicit start
-service vendor.ssgtzd /vendor/bin/ssgtzd
-    class late_start
-    user system
-    group system
-    disabled
-    socket ssgtzd stream 0660 system inet
-    socket qwes_ipc stream 0660 system inet
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc
deleted file mode 100644
index 4fad146..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Copyright (c) 2017-2018, 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-service qti_esepowermanager_service_1_1 /vendor/bin/hw/vendor.qti.esepowermanager@1.1-service
-    class hal
-    user system
-    group nfc system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
deleted file mode 100644
index 8a4bafa..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-service vendor.capabilityconfigstore /vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
-    class hal
-    user system
-    group system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
deleted file mode 100644
index 11b7f1c..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2017 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-service vendor-factory-hal-1-0 /vendor/bin/hw/vendor.qti.hardware.factory@1.0-service
-    interface vendor.qti.hardware.factory@1.0::IFactory default
-    interface vendor.qti.hardware.factory@1.1::IFactory default
-    class hal
-    user system
-    group system
-    disabled
-    oneshot
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc
deleted file mode 100644
index 8324b28..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-on post-fs-data
-    # create QDMA shard dropbox
-    mkdir /data/vendor/qdma/shared 0770 system system
-    mkdir /data/vendor/qdma/shared/3 0770 system system
-
-service qccvndhalservice /vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service
-  class hal
-  user system
-  group system
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
deleted file mode 100644
index c3ac12b..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-service soter-1-0 /vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
-    class hal
-    user system
-    group system drmrpc 
diff --git a/sdm660-common/proprietary/vendor/etc/permissions/vendor.qti.hardware.factory.xml b/sdm660-common/proprietary/vendor/etc/permissions/vendor.qti.hardware.factory.xml
deleted file mode 100644
index a7cf35f..0000000
--- a/sdm660-common/proprietary/vendor/etc/permissions/vendor.qti.hardware.factory.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2017 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="vendor.qti.hardware.factory-V1.0"
-            file="/system/framework/vendor.qti.hardware.factory-V1.0-java.jar" />
-    <library name="vendor.qti.hardware.factory-V1.1"
-            file="/system/framework/vendor.qti.hardware.factory-V1.1-java.jar" />
-</permissions>
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy
deleted file mode 100644
index d556f3a..0000000
--- a/sdm660-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc
-#
-# Not a contribution.
-#
-# Copyright (C) 2018 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.
-
-mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-munmap: 1
-getuid: 1
-writev: 1
-prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-openat: 1
-futex: 1
-close: 1
-read: 1
-newfstatat: 1
-fstat: 1
-#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_SET_MAX_THREADS || arg1 == BINDER_VERSION
-ioctl: 1
-mremap: 1
-readlinkat: 1
-pread64: 1
-fstatfs: 1
-rt_sigprocmask: 1
-faccessat: 1
-sendto: 1
-rt_sigaction: 1
-socket: arg0 == AF_UNIX || arg0 == AF_QIPCRTR
-recvfrom: 1
-getsockname: 1
-getdents64: 1
-fcntl: 1
-nanosleep: 1
-getrandom: 1
-clone: 1
-pipe2: 1
-exit_group: 1
-write: 1
-exit: 1
-getpid: 1
-sigaltstack: 1
-getrlimit: 1
-restart_syscall: 1
-setsockopt: 1
-sched_getscheduler: 1
-rt_sigreturn: 1
-execve: 1
-madvise: 1
-set_tid_address: 1
-connect: 1
-ppoll: 1
-clock_gettime: 1
diff --git a/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json b/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json
deleted file mode 100644
index 54b74b4..0000000
--- a/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-/********************************************************************
-Copyright (c) 2018-19 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
-*********************************************************************/
-{
-  "embedded_ta_images": [
-    { "name":"qwes"},
-    { "name":"tzsc"}
-  ],
-  "ta_images": [
-    { "path":"/vendor/firmware_mnt/image/qwes.mbn"},
-    { "path":"/vendor/firmware/image/qwes.mbn"},
-    { "path":"/vendor/firmware_mnt/image/haventkn.mbn"},
-    { "path":"/vendor/firmware/image/haventkn.mbn"},
-    { "path":"/vendor/firmware_mnt/image/tzsc.mbn"},
-    { "path":"/vendor/firmware_mnt/image/rtice.mbn"}
-  ]
-}
diff --git a/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json b/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json
deleted file mode 100644
index 4e925a7..0000000
--- a/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json
+++ /dev/null
@@ -1,34 +0,0 @@
-/********************************************************************
-Copyright (c) 2018 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
-*********************************************************************/
-
-/*
- * Configure class Ids available to third-party apps that try to
- * communicate with TZ. The rules defined here are used by
- * com.qualcomm.qti.qms.service.TrustZoneAccess to determine
- * what classes are available to clients.
- *
- * For Example -
- * { "classId":"80", "name":"I Need Location TA", "permissions":[ "android.permission.ACCESS_FINE_LOCATION" ] },
- * classId: The class ID that a TA is assigned.
- * name: The name of that TA. This is only a placeholder for now.
- * permissions: A list of Android permissions that a client must have to use this TA.
- */
-
-
-{
-  "whitelist": [
-    { "classId":"3", "name":"App Loader", "permissions":[] },
-    { "classId":"34", "name":"PVC License", "permissions":[] },
-    { "classId":"62", "name":"Device Attestation", "permissions":[] },
-    { "classId":"78", "name":"Haven Token", "permissions":[] },
-    { "classId":"70", "name":"RTIC App", "permissions":[] },
-    { "classId":"71", "name":"RTICe App", "permissions":[] },
-    { "classId":"101", "name":"Celluar Security Measures", "permissions":[] },
-    { "classId":"102", "name":"SCPassThrough", "permissions":[] },
-    { "classId":"119", "name":"Platform Feature Management", "permissions":[] },
-    { "classId":"146", "name":"TLOC Service", "permissions":[] }
-  ]
-}
diff --git a/sdm660-common/proprietary/vendor/lib/hw/activity_recognition.sdm660.so b/sdm660-common/proprietary/vendor/lib/hw/activity_recognition.sdm660.so
deleted file mode 100755
index 5c05482..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/hw/activity_recognition.sdm660.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib/librs_adreno.so b/sdm660-common/proprietary/vendor/lib/librs_adreno.so
deleted file mode 100755
index 8a8cfc5..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/librs_adreno.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/activity_recognition.sdm660.so b/sdm660-common/proprietary/vendor/lib64/hw/activity_recognition.sdm660.so
deleted file mode 100755
index 41ca538..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/activity_recognition.sdm660.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so
deleted file mode 100755
index bf376ae..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so b/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so
deleted file mode 100755
index e3fc7d1..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/liblocdiagiface.so b/sdm660-common/proprietary/vendor/lib64/liblocdiagiface.so
deleted file mode 100644
index c74bc0e..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/liblocdiagiface.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libnative-api.so b/sdm660-common/proprietary/vendor/lib64/libnative-api.so
deleted file mode 100644
index 9670e55..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libnative-api.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so b/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so
deleted file mode 100755
index 12ed8ad..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/librs_adreno.so b/sdm660-common/proprietary/vendor/lib64/librs_adreno.so
deleted file mode 100755
index b36fc8c..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/librs_adreno.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so
deleted file mode 100755
index 2fb0144..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so
deleted file mode 100755
index f9cc863..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.0.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.0.so
deleted file mode 100755
index 70c511c..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.0.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.1.so b/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.1.so
deleted file mode 100755
index 142b85b..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.1.so and /dev/null differ
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index 0cd9f39..7cf907f 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -6,12 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/asus/sdm660-common
 
 PRODUCT_COPY_FILES += \
-    vendor/asus/sdm660-common/proprietary/product/etc/permissions/telephony_product_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/telephony_product_privapp-permissions-qti.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_callback_sample_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_callback_sample_system \
-    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_dci_sample_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_dci_sample_system \
-    vendor/asus/sdm660-common/proprietary/system_ext/bin/diag_mdlog_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/diag_mdlog_system \
     vendor/asus/sdm660-common/proprietary/system_ext/bin/dpmd:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/dpmd \
-    vendor/asus/sdm660-common/proprietary/system_ext/bin/test_diag_system:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/test_diag_system \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/cdma_call_conf.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/cdma_call_conf.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
@@ -25,24 +20,16 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/embms-noship_product_privapp_permissions_qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/embms-noship_product_privapp_permissions_qti.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/embms.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/embms.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/lpa.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/lpa.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/telephonyservice.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/telephonyservice.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteclient.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/uimremoteclient.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/permissions/uimremoteserver.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/uimremoteserver.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/spn-conf.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/spn-conf.xml \
     vendor/asus/sdm660-common/proprietary/system_ext/etc/sysconfig/qti_whitelist_system_ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist_system_ext.xml \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libadsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libadsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libcdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libcdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libmdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libsdsprpc_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.dpm.api@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/com.qualcomm.qti.imscmservice@2.0.so \
@@ -63,10 +50,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvt.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvt.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvtextutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtextutils.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/lib-imsvtutils.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/lib-imsvtutils.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libDiagService.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libDiagService.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libadsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libadsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libcdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libcdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdiag_system.qti.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.qti.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdiag_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdiag_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmctmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmctmgr.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libdpmfdmgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libdpmfdmgr.so \
@@ -79,19 +62,11 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libfm-hci.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libfm-hci.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libimscamera_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimscamera_jni.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libimsmedia_jni.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libimsmedia_jni.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libjnihelpers.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libjnihelpers.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmink-sock-native-api.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmink-sock-native-api.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libminksocket_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libminksocket_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpdecoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpdecoder.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmmrtpencoder.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmrtpencoder.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmsp.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmsp.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libmwqemiptablemgr.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmwqemiptablemgr.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libqmi_cci_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqmi_cci_system.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/libqmi_encdec_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libqmi_encdec_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libsdsprpc_system.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libsdsprpc_system.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libtrigger-handler.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libtrigger-handler.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/libupdateprof.qti.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libupdateprof.qti.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.data.factory@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.data.factory@2.1.so \
@@ -110,10 +85,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.latency@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.lce@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.lce@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.embmssl@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.embmssl@1.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.fm@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.am@1.0.so \
@@ -124,10 +95,8 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.4.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.5.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.5.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.6.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.6.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.7.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.ims@1.7.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.lpa@1.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.lpa@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.lpa@1.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so \
@@ -135,8 +104,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.2.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.3.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.4.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.5.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.qtiradio@2.6.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.hardware.radio.uim@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.radio.uim@1.2.so \
@@ -155,8 +122,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.ims.rcsconfig@2.1.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
     vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.latency@2.0.so \
-    vendor/asus/sdm660-common/proprietary/system_ext/lib64/vendor.qti.latency@2.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.latency@2.1.so \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
     vendor/asus/sdm660-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/cnd:$(TARGET_COPY_OUT_VENDOR)/bin/cnd \
@@ -170,38 +135,27 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@3.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.esepowermanager@1.1-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.esepowermanager@1.1-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.factory@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.factory@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-service \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qccvndhal@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qseecom@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.soter@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.soter@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ims_rtp_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ims_rtp_daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsdatadaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsdatadaemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsqmidaemon:$(TARGET_COPY_OUT_VENDOR)/bin/imsqmidaemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/imsrcsd:$(TARGET_COPY_OUT_VENDOR)/bin/imsrcsd \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/nqnfcinfo:$(TARGET_COPY_OUT_VENDOR)/bin/nqnfcinfo \
     vendor/asus/sdm660-common/proprietary/vendor/bin/irsc_util:$(TARGET_COPY_OUT_VENDOR)/bin/irsc_util \
     vendor/asus/sdm660-common/proprietary/vendor/bin/loc_launcher:$(TARGET_COPY_OUT_VENDOR)/bin/loc_launcher \
     vendor/asus/sdm660-common/proprietary/vendor/bin/lowi-server:$(TARGET_COPY_OUT_VENDOR)/bin/lowi-server \
     vendor/asus/sdm660-common/proprietary/vendor/bin/mlid:$(TARGET_COPY_OUT_VENDOR)/bin/mlid \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/mmid:$(TARGET_COPY_OUT_VENDOR)/bin/mmid \
     vendor/asus/sdm660-common/proprietary/vendor/bin/msm_irqbalance:$(TARGET_COPY_OUT_VENDOR)/bin/msm_irqbalance \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/mutualex:$(TARGET_COPY_OUT_VENDOR)/bin/mutualex \
     vendor/asus/sdm660-common/proprietary/vendor/bin/netmgrd:$(TARGET_COPY_OUT_VENDOR)/bin/netmgrd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pd-mapper:$(TARGET_COPY_OUT_VENDOR)/bin/pd-mapper \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pm-proxy:$(TARGET_COPY_OUT_VENDOR)/bin/pm-proxy \
     vendor/asus/sdm660-common/proprietary/vendor/bin/pm-service:$(TARGET_COPY_OUT_VENDOR)/bin/pm-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/port-bridge:$(TARGET_COPY_OUT_VENDOR)/bin/port-bridge \
     vendor/asus/sdm660-common/proprietary/vendor/bin/power_off_alarm:$(TARGET_COPY_OUT_VENDOR)/bin/power_off_alarm \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/qcc-trd:$(TARGET_COPY_OUT_VENDOR)/bin/qcc-trd \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/qmipriod:$(TARGET_COPY_OUT_VENDOR)/bin/qmipriod \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-cfg:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-cfg \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-lookup:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-lookup \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qrtr-ns:$(TARGET_COPY_OUT_VENDOR)/bin/qrtr-ns \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/qti:$(TARGET_COPY_OUT_VENDOR)/bin/qti \
@@ -209,14 +163,12 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/sensors.qti:$(TARGET_COPY_OUT_VENDOR)/bin/sensors.qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/slim_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/slim_daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ssgqmigd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgqmigd \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/ssgtzd:$(TARGET_COPY_OUT_VENDOR)/bin/ssgtzd \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ssr_diag:$(TARGET_COPY_OUT_VENDOR)/bin/ssr_diag \
     vendor/asus/sdm660-common/proprietary/vendor/bin/ssr_setup:$(TARGET_COPY_OUT_VENDOR)/bin/ssr_setup \
     vendor/asus/sdm660-common/proprietary/vendor/bin/subsystem_ramdump:$(TARGET_COPY_OUT_VENDOR)/bin/subsystem_ramdump \
     vendor/asus/sdm660-common/proprietary/vendor/bin/tftp_server:$(TARGET_COPY_OUT_VENDOR)/bin/tftp_server \
     vendor/asus/sdm660-common/proprietary/vendor/bin/thermal-engine:$(TARGET_COPY_OUT_VENDOR)/bin/thermal-engine \
     vendor/asus/sdm660-common/proprietary/vendor/bin/time_daemon:$(TARGET_COPY_OUT_VENDOR)/bin/time_daemon \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/vendor.qti.hardware.soter@1.0-provision:$(TARGET_COPY_OUT_VENDOR)/bin/vendor.qti.hardware.soter@1.0-provision \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtra-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/xtra-daemon \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-client:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-client \
     vendor/asus/sdm660-common/proprietary/vendor/bin/xtwifi-inet-agent:$(TARGET_COPY_OUT_VENDOR)/bin/xtwifi-inet-agent \
@@ -266,27 +218,17 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsdatadaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdatadaemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsqmidaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsqmidaemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/imsrcsd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsrcsd.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/init.qdmastats.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qdmastats.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/init.time_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.time_daemon.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/mutualex.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mutualex.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/netmgrd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netmgrd.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/port-bridge.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/port-bridge.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/qmipriod.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.debug.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/qmipriod.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qmipriod.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/ssgtzd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ssgtzd.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.esepowermanager@1.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.esepowermanager@1.1-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.factory@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.factory@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qccvndhal@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.soter@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.rmt_storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.rmt_storage.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
@@ -297,13 +239,9 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/permissions/android.hardware.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.light.xml \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/permissions/vendor.qti.hardware.factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.qti.hardware.factory.xml \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/atfwd@2.0.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qti-systemd.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/ta_config.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/ta_config.json \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/ssg/tz_whitelist.json:$(TARGET_COPY_OUT_VENDOR)/etc/ssg/tz_whitelist.json \
     vendor/asus/sdm660-common/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
     vendor/asus/sdm660-common/proprietary/vendor/etc/xtra_root_cert.pem:$(TARGET_COPY_OUT_VENDOR)/etc/xtra_root_cert.pem \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/eglSubDriverAndroid.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/eglSubDriverAndroid.so \
@@ -312,7 +250,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libGLESv2_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib/egl/libq3dtools_esx.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/hw/activity_recognition.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/activity_recognition.sdm660.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/android.hardware.keymaster@3.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/android.hardware.keymaster@3.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/com.dsi.ant@1.0-impl.so \
@@ -395,7 +332,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqti-perfd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-perfd.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqti-util.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqti-util.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libqtigef.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqtigef.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/librs_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdedrm.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-color.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libsdm-diag.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdm-diag.so \
@@ -451,19 +387,16 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/egl/libGLESv2_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libGLESv2_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/egl/libq3dtools_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/egl/libq3dtools_esx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/egl/libq3dtools_esx.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/activity_recognition.sdm660.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/activity_recognition.sdm660.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/com.dsi.ant@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.dsi.ant@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/sensors.sdm660_64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/sensors.sdm660_64.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.esepowermanager@1.1-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.gnss@4.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.gnss@4.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.1-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qccvndhal@1.0-impl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
@@ -569,7 +502,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libloc_socket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libloc_socket.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liblocationservice.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liblocationservice_glue.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocationservice_glue.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/liblocdiagiface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblocdiagiface.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liblowi_client.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_client.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liblowi_wifihal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblowi_wifihal.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/liblqe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblqe.so \
@@ -579,7 +511,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libminksocket.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libminksocket.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libmm-hdcpmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmm-hdcpmgr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libnative-api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnative-api.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_common.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libnetmgr_nr_fusion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnetmgr_nr_fusion.so \
@@ -598,7 +529,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcrilFramework.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrilFramework.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqcrildatactl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqcrildatactl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdi.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdma_file_agent.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdma_file_agent.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqdp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqdp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libqmi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqmi.so \
@@ -623,7 +553,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librilqmiservices.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librilqmiservices.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librmp.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/librs_adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librs_adreno.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdedrm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdedrm.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdm-color.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdm-color.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/libsdm-diag.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdm-diag.so \
@@ -667,8 +596,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.factory@2.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.factory@2.2.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.mwqem@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.mwqem@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.data.slm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.data.slm@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.esepowermanager@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.esepowermanager@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.esepowermanager@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.gnss@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.gnss@1.2.so \
@@ -691,8 +618,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.latency@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.latency@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.data.qmi@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.data.qmi@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.dsp@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.dsp@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.factory@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.factory@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.factory@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fm@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.mwqemadapter@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
@@ -701,7 +626,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.am@1.0.so \
-    vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.2.so \
@@ -758,21 +682,9 @@ PRODUCT_PACKAGES += \
     CACertService \
     CneApp \
     IWlanService \
-    QCC-TR-UI \
     TimeService \
-    CallFeaturesSetting \
-    ConfURIDialer \
-    ConferenceDialer \
-    DeviceInfo \
     DeviceStatisticsService \
-    DynamicDDSService \
-    NetworkSetting \
-    QTIDiagServices \
     QtiTelephonyService \
-    SimContact \
-    SimSettings \
-    atfwd \
-    embms \
     imssettings \
     remoteSimLockAuthentication \
     remotesimlockservice \
@@ -782,7 +694,6 @@ PRODUCT_PACKAGES += \
     uimremoteclient \
     uimremoteserver \
     xdivert \
-    QAS_DVC_MSP \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
@@ -803,7 +714,6 @@ PRODUCT_PACKAGES += \
     com.quicinc.cne.constants-V2.0-java \
     com.quicinc.cne.constants-V2.1-java \
     dpmapi \
-    embmslibrary \
     qcrilhook \
     qti-telephony-common \
     remotesimlockmanagerlibrary \
@@ -842,6 +752,5 @@ PRODUCT_PACKAGES += \
     vendor.qti.ims.rcsconfig-V2.0-java \
     vendor.qti.ims.rcsconfig-V2.1-java \
     vendor.qti.latency-V2.0-java \
-    vendor.qti.latency-V2.1-java \
     manifest_android.hardware.drm@1.3-service.widevine \
     vendor.qti.gnss@4.0-service