diff --git a/common.mk b/common.mk
index e1e4e4172..e8127b222 100644
--- a/common.mk
+++ b/common.mk
@@ -200,10 +200,6 @@ PRODUCT_PACKAGES += \
     qspa_system.rc \
     qspa_default.rc
 
-# Trusted User Interface
-PRODUCT_PACKAGES += \
-    android.hidl.memory.block@1.0.vendor
-
 # usbudev service for usb ip assigment
 PRODUCT_PACKAGES += \
     usbudev
@@ -216,10 +212,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_VENDOR_PROPERTIES += \
     ro.soc.manufacturer=QTI
 
-# WiFi Display
-PRODUCT_PACKAGES += \
-    libwfdaac_vendor
-
 # RFS APQ GNSS symlinks
 PRODUCT_PACKAGES += \
     rfs_apq_gnss_hlos_symlink \
diff --git a/system/av/qti-av.mk b/system/av/qti-av.mk
index d7d9c0651..6b329e11d 100644
--- a/system/av/qti-av.mk
+++ b/system/av/qti-av.mk
@@ -16,10 +16,6 @@
 AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true
 
 # Media
-PRODUCT_PACKAGES += \
-    libavservices_minijail \
-    libmediaplayerservice
-
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
     vendor.mm.enable.qcom_parser=16777215
 
diff --git a/system/display/qti-display.mk b/system/display/qti-display.mk
index d773a61c7..af4479e65 100644
--- a/system/display/qti-display.mk
+++ b/system/display/qti-display.mk
@@ -19,9 +19,5 @@ include vendor/qcom/opensource/commonsys-intf/display/config/display-product-sys
 include vendor/qcom/opensource/commonsys/display/config/display-product-commonsys.mk
 endif
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.graphics.common-V1-ndk
-
 # Get non-open-source specific aspects.
 $(call inherit-product-if-exists, vendor/qcom/common/system/display/display-vendor.mk)
diff --git a/system/perf/qti-perf.mk b/system/perf/qti-perf.mk
index 707491d1a..88649a3fd 100644
--- a/system/perf/qti-perf.mk
+++ b/system/perf/qti-perf.mk
@@ -17,11 +17,5 @@ PRODUCT_BOOT_JARS += \
     QPerformance \
     UxPerformance
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.thermal@2.0 \
-    libavservices_minijail \
-    vendor.qti.hardware.qspa-V1-ndk
-
 # Get non-open-source specific aspects
 $(call inherit-product-if-exists, vendor/qcom/common/system/perf/perf-vendor.mk)
diff --git a/system/telephony/qti-telephony.mk b/system/telephony/qti-telephony.mk
index f31f989cb..4ead995fb 100644
--- a/system/telephony/qti-telephony.mk
+++ b/system/telephony/qti-telephony.mk
@@ -15,15 +15,6 @@
 # AIDL / HIDL
 SYSTEM_EXT_MANIFEST_FILES += $(QCOM_COMMON_PATH)/system/telephony/atcmdfwd-saidl.xml
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.radio@1.6 \
-    android.hardware.radio.config@1.3 \
-    android.hardware.radio.deprecated@1.0 \
-    android.system.net.netd@1.1 \
-    libc++.product \
-    libjson
-
 # Properties
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
     DEVICE_PROVISIONED=1 \
diff --git a/system/wfd/qti-wfd.mk b/system/wfd/qti-wfd.mk
index f2cbf4339..d9e81b592 100644
--- a/system/wfd/qti-wfd.mk
+++ b/system/wfd/qti-wfd.mk
@@ -14,10 +14,6 @@
 
 TARGET_WFD_COMPONENT_VARIANT := wfd
 
-PRODUCT_PACKAGES += \
-    libavservices_minijail \
-    libnl
-
 PRODUCT_BOOT_JARS += \
     WfdCommon
 
diff --git a/vendor/adreno-5xx/qti-adreno-5xx.mk b/vendor/adreno-5xx/qti-adreno-5xx.mk
index 6685a63a7..0881f5c12 100644
--- a/vendor/adreno-5xx/qti-adreno-5xx.mk
+++ b/vendor/adreno-5xx/qti-adreno-5xx.mk
@@ -14,10 +14,6 @@
 
 TARGET_ADRENO_COMPONENT_VARIANT := adreno-5xx
 
-# Dependencies
-PRODUCT_PACKAGES += \
-    vendor.qti.hardware.display.mapper@2.0.vendor
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
diff --git a/vendor/audio/qti-audio.mk b/vendor/audio/qti-audio.mk
index f59d08ce7..cf43bb0fb 100644
--- a/vendor/audio/qti-audio.mk
+++ b/vendor/audio/qti-audio.mk
@@ -48,31 +48,7 @@ endif
 
 # Audio Packages
 PRODUCT_PACKAGES += \
-    audioadsprpcd \
-    audio.primary.$(TARGET_BOARD_PLATFORM) \
-    audio.r_submix.default \
-    audio.usb.default \
-    liba2dpoffload \
-    libaudioroute \
-    libbatterylistener \
-    libcirrusspkrprot \
-    libcomprcapture \
-    libexthwplugin \
-    libhdmiedid \
-    libhfp \
-    libhfp_pal \
-    libqcompostprocbundle \
-    libqcomvisualizer \
-    libqcomvoiceprocessing \
-    libsndcardparser \
-    libsndmonitor \
-    libspkrprot \
-    libssrec \
-    libtinycompress \
-    libvolumelistener \
-    sound_trigger.primary.$(TARGET_BOARD_PLATFORM) \
-    vendor.qti.hardware.pal@1.0.vendor \
-    vendor.qti.hardware.AGMIPC@1.0.vendor
+    libvolumelistener
 
 # Permissions
 PRODUCT_COPY_FILES += \
diff --git a/vendor/bt/qti-bt.mk b/vendor/bt/qti-bt.mk
index 6242add77..65d8bcef0 100644
--- a/vendor/bt/qti-bt.mk
+++ b/vendor/bt/qti-bt.mk
@@ -12,18 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.1.vendor \
-    audio.bluetooth.default \
-    com.dsi.ant@1.0.vendor \
-    com.qualcomm.qti.bluetooth_audio@1.0.vendor \
-    libldacBT_enc \
-    libldacBT_abr \
-    vendor.qti.hardware.bluetooth_audio@2.1.vendor \
-    vendor.qti.hardware.btconfigstore@1.0.vendor \
-    vendor.qti.hardware.btconfigstore@2.0.vendor
-
 ifeq ($(TARGET_USE_AIDL_QTI_BT_AUDIO),true)
 PRODUCT_PACKAGES += \
     android.hardware.bluetooth.audio-impl \
diff --git a/vendor/charging/qti-charging.mk b/vendor/charging/qti-charging.mk
index 2e43673de..16440c26a 100644
--- a/vendor/charging/qti-charging.mk
+++ b/vendor/charging/qti-charging.mk
@@ -34,10 +34,6 @@ PRODUCT_SYSTEM_EXT_PROPERTIES += \
     ro.charger.enable_suspend=1
 endif
 
-# Suspend
-PRODUCT_PACKAGES += \
-    libsuspend
-
 # Init
 PRODUCT_COPY_FILES += \
     $(QCOM_COMMON_PATH)/vendor/charging/vendor.qti.hardware.charger_monitor@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
diff --git a/vendor/display/qti-display.mk b/vendor/display/qti-display.mk
index 7aad3a9e6..8c6b07a60 100644
--- a/vendor/display/qti-display.mk
+++ b/vendor/display/qti-display.mk
@@ -23,12 +23,6 @@
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.graphics.common-V1-ndk.vendor \
-    libqdutils \
-    libqservice
-
 # Properties for <5.15 targets
 # These are already set on 5.15+.
 ifneq (,$(filter 3.18 4.4 4.9 4.14 4.19 5.4 5.10, $(TARGET_KERNEL_VERSION)))
diff --git a/vendor/gps/qti-gps.mk b/vendor/gps/qti-gps.mk
index c32522ae6..46bb873b2 100644
--- a/vendor/gps/qti-gps.mk
+++ b/vendor/gps/qti-gps.mk
@@ -27,10 +27,6 @@ $(call inherit-product-if-exists, hardware/qcom/gps/gps_vendor_product.mk)
 PRODUCT_PACKAGES += \
     QCOMGPSFrameworksOverlay
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.gnss-V2-ndk.vendor
-
 # Permissions
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml
diff --git a/vendor/keymaster/qti-keymaster.mk b/vendor/keymaster/qti-keymaster.mk
index 9a29039d8..e25191900 100644
--- a/vendor/keymaster/qti-keymaster.mk
+++ b/vendor/keymaster/qti-keymaster.mk
@@ -12,12 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.gatekeeper@1.0.vendor \
-    android.hardware.keymaster@4.0.vendor \
-    android.hardware.keymaster@4.1.vendor
-
 DEVICE_MANIFEST_FILE += \
     $(QCOM_COMMON_PATH)/vendor/keymaster/gatekeeper-manifest.xml \
     $(QCOM_COMMON_PATH)/vendor/keymaster/keymaster-manifest.xml
diff --git a/vendor/media-5.4/qti-media-5.4.mk b/vendor/media-5.4/qti-media-5.4.mk
index 3b4226cc9..62648a1b8 100644
--- a/vendor/media-5.4/qti-media-5.4.mk
+++ b/vendor/media-5.4/qti-media-5.4.mk
@@ -24,10 +24,6 @@ $(call inherit-product-if-exists, hardware/qcom/media/product.mk)
 PRODUCT_VENDOR_PROPERTIES += \
     ro.mediaserver.64b.enable=true
 
-# Packages
-PRODUCT_PACKAGES += \
-    libavservices_minijail.vendor
-
 # Properties
 PRODUCT_SYSTEM_EXT_PROPERTIES += \
     media.settings.xml=/vendor/etc/media_profiles_vendor.xml \
diff --git a/vendor/nfc/qti-nfc.mk b/vendor/nfc/qti-nfc.mk
index 48c16014f..f7fed2785 100644
--- a/vendor/nfc/qti-nfc.mk
+++ b/vendor/nfc/qti-nfc.mk
@@ -12,12 +12,6 @@ ifeq ($(TARGET_USES_NQ_NFC), true)
 $(call inherit-product, vendor/nxp/opensource/commonsys/packages/apps/Nfc/nfc_system_product.mk)
 $(call inherit-product, vendor/nxp/opensource/halimpl/nfc_vendor_product.mk)
 
-# Packages
-PRODUCT_PACKAGES += \
-    se_nq_extn_client \
-    ls_nq_client \
-    jcos_nq_client
-
 # Permissions
 ifneq ($(TARGET_NFC_SKU),)
 NFC_PERMISSIONS_DIR := $(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(TARGET_NFC_SKU)
diff --git a/vendor/perf/qti-perf.mk b/vendor/perf/qti-perf.mk
index fa2ddea5c..919225de3 100644
--- a/vendor/perf/qti-perf.mk
+++ b/vendor/perf/qti-perf.mk
@@ -35,16 +35,6 @@ PRODUCT_COPY_FILES += \
     $(QCOM_COMMON_PATH)/vendor/perf/poweropt-service-disable.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/poweropt-service-disable.rc
 endif
 
-# Packages
-PRODUCT_PACKAGES += \
-    android.hardware.thermal@2.0.vendor \
-    android.hardware.thermal-V1-ndk.vendor \
-    libavservices_minijail.vendor \
-    libpsi.vendor \
-    libtflite \
-    vendor.qti.hardware.servicetracker@1.1.vendor \
-    vendor.qti.hardware.servicetrackeraidl-V1-ndk.vendor
-
 # Only copy task_profiles.json for 5.4 targets.
 ifeq ($(TARGET_KERNEL_VERSION),5.4)
 PRODUCT_COPY_FILES += \
diff --git a/vendor/qseecomd-legacy/qti-qseecomd-legacy.mk b/vendor/qseecomd-legacy/qti-qseecomd-legacy.mk
index 64afedaaa..6231cdac5 100644
--- a/vendor/qseecomd-legacy/qti-qseecomd-legacy.mk
+++ b/vendor/qseecomd-legacy/qti-qseecomd-legacy.mk
@@ -12,8 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PRODUCT_PACKAGES += \
-    libdrm.vendor
-
 # Get non-open-source specific aspects.
 $(call inherit-product-if-exists, vendor/qcom/common/vendor/qseecomd-legacy/qseecomd-legacy-vendor.mk)
diff --git a/vendor/qseecomd/qti-qseecomd.mk b/vendor/qseecomd/qti-qseecomd.mk
index 468a364dc..a0346d041 100644
--- a/vendor/qseecomd/qti-qseecomd.mk
+++ b/vendor/qseecomd/qti-qseecomd.mk
@@ -12,8 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-PRODUCT_PACKAGES += \
-    libdrm.vendor
-
 # Get non-open-source specific aspects.
 $(call inherit-product-if-exists, vendor/qcom/common/vendor/qseecomd/qseecomd-vendor.mk)
diff --git a/vendor/telephony/qti-telephony.mk b/vendor/telephony/qti-telephony.mk
index ad53269d3..693db1a43 100644
--- a/vendor/telephony/qti-telephony.mk
+++ b/vendor/telephony/qti-telephony.mk
@@ -37,25 +37,6 @@ endif
 # RIL
 ENABLE_VENDOR_RIL_SERVICE := true
 
-PRODUCT_PACKAGES += \
-    android.hardware.radio@1.6.vendor \
-    android.hardware.radio.config@1.3.vendor \
-    android.hardware.radio.deprecated@1.0.vendor \
-    android.hardware.secure_element@1.2.vendor \
-    android.hardware.wifi.hostapd@1.0.vendor \
-    android.system.net.netd@1.1.vendor \
-    vendor.qti.hardware.systemhelperaidl-V1-ndk.vendor
-
-PRODUCT_PACKAGES += \
-    android.hardware.radio.config-V1-ndk.vendor \
-    android.hardware.radio.data-V1-ndk.vendor \
-    android.hardware.radio.messaging-V1-ndk.vendor \
-    android.hardware.radio.modem-V1-ndk.vendor \
-    android.hardware.radio.network-V1-ndk.vendor \
-    android.hardware.radio.sim-V1-ndk.vendor \
-    android.hardware.radio.voice-V1-ndk.vendor \
-    android.hardware.radio-V1-ndk.vendor
-
 PRODUCT_VENDOR_PROPERTIES += \
     persist.radio.multisim.config=dsds \
     persist.vendor.radio.apm_sim_not_pwdn=1 \
diff --git a/vendor/wlan-legacy/qti-wlan-legacy.mk b/vendor/wlan-legacy/qti-wlan-legacy.mk
index daaa0e70c..57bfc4d1f 100644
--- a/vendor/wlan-legacy/qti-wlan-legacy.mk
+++ b/vendor/wlan-legacy/qti-wlan-legacy.mk
@@ -47,10 +47,6 @@ PRODUCT_PACKAGES += \
     wpa_supplicant \
     wpa_supplicant.conf
 
-PRODUCT_PACKAGES += \
-    android.hardware.wifi.supplicant-V1-ndk.vendor \
-    vendor.qti.hardware.wifi.supplicant-V1-ndk.vendor
-
 ifeq ($(call is-board-platform-in-list, lahaina),true)
 PRODUCT_PACKAGES += \
     init.vendor.wlan.rc