diff --git a/device.mk b/device.mk
index 2f180aa9..34e60319 100644
--- a/device.mk
+++ b/device.mk
@@ -294,12 +294,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.audio.monitorRotation=true
 
-# Iaxxx streming and factory binary
-PRODUCT_PACKAGES += \
-    libtunnel \
-    libodsp \
-    adnc_strm.primary.default
-
 # graphics
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.opengles.version=196610
@@ -392,21 +386,10 @@ PRODUCT_PACKAGES += \
     android.hardware.memtrack@1.0-impl \
     android.hardware.memtrack@1.0-service
 
-# Bluetooth HAL
-PRODUCT_PACKAGES += \
-    android.hardware.bluetooth@1.0-impl-qti \
-    android.hardware.bluetooth@1.0-service-qti
-
 #Bluetooth SAR HAL
-PRODUCT_PACKAGES += \
-    hardware.google.bluetooth.sar@1.0-impl
 PRODUCT_PACKAGES_DEBUG += \
     bluetooth_sar_test
 
-# Bluetooth AFH
-PRODUCT_PACKAGES += \
-    hardware.google.bluetooth.bt_channel_avoidance@1.0-impl
-
 # Bluetooth SoC
 PRODUCT_PROPERTY_OVERRIDES += \
     vendor.qcom.bluetooth.soc=cherokee
@@ -425,8 +408,7 @@ PRODUCT_SOONG_NAMESPACES += vendor/qcom/proprietary/bluetooth/hidl_client
 
 # DRM HAL
 PRODUCT_PACKAGES += \
-    android.hardware.drm-service.clearkey \
-    android.hardware.drm-service.widevine
+    android.hardware.drm-service.clearkey
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \
@@ -458,18 +440,9 @@ PRODUCT_PACKAGES += \
     libOmxCore \
     libstagefrighthw \
     libOmxVdec \
-    libOmxVdecHevc \
     libOmxVenc \
     libc2dcolorconvert
 
-# Enable Codec 2.0
-PRODUCT_PACKAGES += \
-    libqcodec2 \
-    vendor.qti.media.c2@1.0-service \
-    media_codecs_c2.xml \
-    codec2.vendor.ext.policy \
-    codec2.vendor.base.policy
-
 PRODUCT_PROPERTY_OVERRIDES += \
     debug.stagefright.omx_default_rank=512
 
@@ -497,14 +470,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.ims.mm_minqp=1
 
 PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.7-impl-google \
-    android.hardware.camera.provider@2.7-service-google \
-    camera.sm6150 \
-    libgooglecamerahwl_impl \
-    libqomx_core \
-    libmmjpeg_interface \
-    libmmcamera_interface \
-    libcameradepthcalibrator
+    android.hardware.camera.provider@2.7-service-google
 
 # Google Camera HAL test libraries in debug builds
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
@@ -515,8 +481,7 @@ endif
 
 PRODUCT_PACKAGES += \
     sensors.$(PRODUCT_HARDWARE) \
-    android.hardware.sensors@2.0-service.multihal \
-    hals.conf
+    android.hardware.sensors@2.0-service.multihal
 
 PRODUCT_PACKAGES += \
     fs_config_dirs \
@@ -581,7 +546,6 @@ endif
 PRODUCT_PACKAGES += $(HOSTAPD)
 
 WPA := wpa_supplicant.conf
-WPA += wpa_supplicant_wcn.conf
 WPA += wpa_supplicant
 PRODUCT_PACKAGES += $(WPA)
 
@@ -606,19 +570,11 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi_concurrency_cfg.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wifi_concurrency_cfg.txt \
     $(LOCAL_PATH)/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini \
 
-LIB_NL := libnl_2
-PRODUCT_PACKAGES += $(LIB_NL)
-
 # Audio effects
 PRODUCT_PACKAGES += \
-    libvolumelistener \
-    libqcomvisualizer \
-    libqcomvoiceprocessing \
-    libqcomvoiceprocessingdescriptors \
-    libqcompostprocbundle
+    libqcomvoiceprocessingdescriptors
 
 PRODUCT_PACKAGES += \
-    audio.primary.sm6150 \
     audio.usb.default \
     audio.r_submix.default \
     libaudio-resampler \
@@ -631,16 +587,6 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth.audio@2.0-impl \
     android.hardware.audio.service
 
-# Modules for Audio HAL
-PRODUCT_PACKAGES += \
-    libcirrusspkrprot \
-    libsndmonitor \
-    libmalistener \
-    liba2dpoffload \
-    btaudio_offload_if \
-    libmaxxaudio \
-    libaudiozoom
-
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
     tinyplay \
@@ -722,9 +668,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.frp.pst=/dev/block/bootdevice/by-name/frp
 
-PRODUCT_PACKAGES += \
-    vndk-sp
-
 # Override heap growth limit due to high display density on device
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapgrowthlimit?=256m
@@ -826,8 +769,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf
 
 # Fingerprint
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.1-service.fpc
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
 
diff --git a/fingerprint.mk b/fingerprint.mk
index c5a870f1..4b160d9a 100644
--- a/fingerprint.mk
+++ b/fingerprint.mk
@@ -1,7 +1,4 @@
 # Fingerprint
-PRODUCT_PACKAGES += \
-    android.hardware.biometrics.fingerprint@2.2-service.fpc \
-
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/uinput-fpc.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-fpc.kl \
     $(LOCAL_PATH)/uinput-fpc.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-fpc.idc
diff --git a/lineage_sunfish.mk b/lineage_sunfish.mk
index 8d463906..46a0dcc4 100644
--- a/lineage_sunfish.mk
+++ b/lineage_sunfish.mk
@@ -5,7 +5,6 @@
 #
 
 # Inherit some common Lineage stuff.
-TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration