diff --git a/Android.bp b/Android.bp
index 1fa144a8a0e627a5dfece8fb5d9ca2905421a511..64e1709e08b0bd1cf5214e9a042a4d30b0b16b7f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8,12 +8,3 @@ soong_namespace {
 	],
 }
 
-prebuilt_etc_xml {
-	name: "manifest_android.hardware.drm@1.3-service.widevine",
-	owner: "lge",
-	src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
-}
-
diff --git a/mh2lm-vendor.mk b/mh2lm-vendor.mk
index 21837c8d7435aeea60b99922d32e6ef0a8fea218..902151f8d916c89f54102c93f035e4bb1bb0a13c 100644
--- a/mh2lm-vendor.mk
+++ b/mh2lm-vendor.mk
@@ -6,11 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
     vendor/lge/mh2lm
 
 PRODUCT_COPY_FILES += \
-    vendor/lge/mh2lm/proprietary/vendor/bin/cpfirmware:$(TARGET_COPY_OUT_VENDOR)/bin/cpfirmware \
-    vendor/lge/mh2lm/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
     vendor/lge/mh2lm/proprietary/vendor/bin/hw/vendor.lge.hardware.biometrics.fingerprint@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.lge.hardware.biometrics.fingerprint@2.2-service \
-    vendor/lge/mh2lm/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/lge/mh2lm/proprietary/vendor/bin/qseecomd:$(TARGET_COPY_OUT_VENDOR)/bin/qseecomd \
     vendor/lge/mh2lm/proprietary/vendor/etc/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
     vendor/lge/mh2lm/proprietary/vendor/etc/acdbdata/Codec_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Codec_cal.acdb \
     vendor/lge/mh2lm/proprietary/vendor/etc/acdbdata/General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/General_cal.acdb \
@@ -262,11 +258,7 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/etc/camera/smartcam/9_smartcam_food.dat:$(TARGET_COPY_OUT_VENDOR)/etc/camera/smartcam/9_smartcam_food.dat \
     vendor/lge/mh2lm/proprietary/vendor/etc/camera/vnr/SJ_VideoNR_LUT.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/vnr/SJ_VideoNR_LUT.bin \
     vendor/lge/mh2lm/proprietary/vendor/etc/gnss_antenna_info.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss_antenna_info.conf \
-    vendor/lge/mh2lm/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
-    vendor/lge/mh2lm/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
-    vendor/lge/mh2lm/proprietary/vendor/etc/init/qseecomd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qseecomd.rc \
     vendor/lge/mh2lm/proprietary/vendor/etc/init/vendor.lge.hardware.biometrics.fingerprint@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.lge.hardware.biometrics.fingerprint@2.2-service.rc \
-    vendor/lge/mh2lm/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/lge/mh2lm/proprietary/vendor/etc/qdcm_calib_data_Dual_Sharp_WQHD_cmd_mode_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Dual_Sharp_WQHD_cmd_mode_dsi_panel.xml \
     vendor/lge/mh2lm/proprietary/vendor/etc/qdcm_calib_data_Dual_Sharp_wqhd_video_mode_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Dual_Sharp_wqhd_video_mode_dsi_panel.xml \
     vendor/lge/mh2lm/proprietary/vendor/etc/qdcm_calib_data_Dual_nt35597_cmd_mode_dsi_truly_panel_without_DSC.xml.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_Dual_nt35597_cmd_mode_dsi_truly_panel_without_DSC.xml.xml \
@@ -598,19 +590,13 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib/hw/audio.primary.msmnile.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/audio.primary.msmnile.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/hw/camera.msmnile.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/camera.msmnile.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/com.qti.chi.override.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/lib.com.lge.elvis.so:$(TARGET_COPY_OUT_VENDOR)/lib/lib.com.lge.elvis.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libAutoContrast.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAutoContrast.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libCmcPdaf.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCmcPdaf.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libCmcPdaf_tele.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCmcPdaf_tele.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libGPreqcancel.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libGPreqcancel_svc.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib/libQSEEComAPI.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libSJVideoNR.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSJVideoNR.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libSNPE.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSNPE.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libSRIyuv.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSRIyuv.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libSecureUILib.so:$(TARGET_COPY_OUT_VENDOR)/lib/libSecureUILib.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libStDrvInt.so:$(TARGET_COPY_OUT_VENDOR)/lib/libStDrvInt.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_beauty_picselfie.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_beauty_picselfie.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_depth_bokeh_img.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_depth_bokeh_img.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_depthcam_portrait_lighting.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_depthcam_portrait_lighting.so \
@@ -621,7 +607,6 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_object_tracking.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_object_tracking.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_picselfie_algorithm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_picselfie_algorithm.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libarcsoft_singlecam_portrait_lighting.so:$(TARGET_COPY_OUT_VENDOR)/lib/libarcsoft_singlecam_portrait_lighting.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libbase64.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbase64.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libbwfocuspeaking.so:$(TARGET_COPY_OUT_VENDOR)/lib/libbwfocuspeaking.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libc++_shared_snpe.so:$(TARGET_COPY_OUT_VENDOR)/lib/libc++_shared_snpe.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libcamera_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamera_nn_stub.so \
@@ -633,47 +618,27 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib/libcamxtintlessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcamxtintlessalgo.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libcinemaeffect.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcinemaeffect.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libcom.qti.chinodeutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcom.qti.chinodeutils.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcpion.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libdepthcomputation_wrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdepthcomputation_wrapper.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrmfs.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libdrmtime.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrmtime.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libfilm_emulation.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfilm_emulation.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libfilm_emulation_symphony.so:$(TARGET_COPY_OUT_VENDOR)/lib/libfilm_emulation_symphony.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libhdcpsrm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libhdcpsrm.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblgae_main.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblgae_main.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblgawb_main.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblgawb_main.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblgdnnsnpe.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblgdnnsnpe.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblghdri.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblghdri.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblgsnpeawb.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblgsnpeawb.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/liblgsnpeawb_beta.so:$(TARGET_COPY_OUT_VENDOR)/lib/liblgsnpeawb_beta.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmmosal.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libmorpho_image_stab31.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmorpho_image_stab31.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libmorpho_wdr2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmorpho_wdr2.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libmpbase.so:$(TARGET_COPY_OUT_VENDOR)/lib/libmpbase.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/liboemcrypto.so:$(TARGET_COPY_OUT_VENDOR)/lib/liboemcrypto.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libops.so:$(TARGET_COPY_OUT_VENDOR)/lib/libops.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libqisl.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib/librmp.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib/librpmb.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libsecureui.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsecureui.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libsecureui_svcsock.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsecureui_svcsock.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsnsapi.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsnsapi.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libspectre3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspectre3.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libspl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libspl.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib/libssd.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphony-1.1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphony-1.1.2.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphony-1.1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphony-1.1.4.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphony-cpu.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphony-cpu.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphonypower-1.1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphonypower-1.1.2.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphonypower-1.1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphonypower-1.1.4.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libsymphonypower.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsymphonypower.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtrustedapploader.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libtzdrmgenprov.so:$(TARGET_COPY_OUT_VENDOR)/lib/libtzdrmgenprov.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/libwebrtc_audio_preprocessing.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwebrtc_audio_preprocessing.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libwfdcommonutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdcommonutils_proprietary.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfddisplayconfig_proprietary.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libwfdmmservice_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdmmservice_proprietary.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/libwfdutils_proprietary.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwfdutils_proprietary.so \
     vendor/lge/mh2lm/proprietary/vendor/lib/rfsa/adsp/AlacDecoderModule.so.1:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/AlacDecoderModule.so.1 \
     vendor/lge/mh2lm/proprietary/vendor/lib/rfsa/adsp/ApeDecoderModule.so.1:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/ApeDecoderModule.so.1 \
     vendor/lge/mh2lm/proprietary/vendor/lib/rfsa/adsp/AudioContextDetection.so.1:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/AudioContextDetection.so.1 \
@@ -749,7 +714,6 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib/rfsa/adsp/smecns_v2_module.so.1:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/smecns_v2_module.so.1 \
     vendor/lge/mh2lm/proprietary/vendor/lib/rfsa/adsp/smecns_v2_module_fv9.so.1:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/smecns_v2_module_fv9.so.1 \
     vendor/lge/mh2lm/proprietary/vendor/lib/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib/sensors.ssc.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib/vendor.qti.hardware.qseecom@1.0.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/camera/com.qti.eeprom.imx363_fm24c64d.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.imx363_fm24c64d.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/camera/com.qti.eeprom.s5k3m3_fm24c64d.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.s5k3m3_fm24c64d.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/camera/com.qti.eeprom.s5kgd1_fm24c64d.so:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/com.qti.eeprom.s5kgd1_fm24c64d.so \
@@ -874,20 +838,14 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib64/hw/camera.msmnile.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/camera.msmnile.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/hw/com.qti.chi.override.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/com.qti.chi.override.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/hw/fingerprint.msmnile.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/fingerprint.msmnile.so \
-    vendor/lge/mh2lm/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 \
     vendor/lge/mh2lm/proprietary/vendor/lib64/lib.com.lge.elvis.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib.com.lge.elvis.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libAutoContrast.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAutoContrast.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libCmcPdaf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCmcPdaf.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libCmcPdaf_tele.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCmcPdaf_tele.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libQSEEComAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libQSEEComAPI.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libRbsFlow.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libRbsFlow.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libSJVideoNR.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSJVideoNR.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libSNPE.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSNPE.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libSRIyuv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSRIyuv.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libSecureUILib.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSecureUILib.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libStDrvInt.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libStDrvInt.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_beauty_picselfie.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_beauty_picselfie.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_depth_bokeh_img.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_depth_bokeh_img.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_depthcam_portrait_lighting.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_depthcam_portrait_lighting.so \
@@ -899,7 +857,6 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_object_tracking.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_object_tracking.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_picselfie_algorithm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_picselfie_algorithm.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libarcsoft_singlecam_portrait_lighting.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_singlecam_portrait_lighting.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libbase64.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbase64.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libbwfocuspeaking.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbwfocuspeaking.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libc++_shared_snpe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc++_shared_snpe.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libcamera_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_nn_stub.so \
@@ -911,50 +868,30 @@ PRODUCT_COPY_FILES += \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libcamxtintlessalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamxtintlessalgo.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libcinemaeffect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcinemaeffect.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libcom.qti.chinodeutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcom.qti.chinodeutils.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libcpion.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcpion.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libdepthcomputation_wrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdepthcomputation_wrapper.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libdrmfs.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmfs.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libdrmtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdrmtime.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libets_teeclient_v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libets_teeclient_v2.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libfilm_emulation.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfilm_emulation.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libfilm_emulation_symphony.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfilm_emulation_symphony.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libfpsph.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libfpsph.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libhdcpsrm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdcpsrm.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblgae_main.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblgae_main.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblgawb_main.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblgawb_main.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblgdnnsnpe.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblgdnnsnpe.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblghdri.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblghdri.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblgsnpeawb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblgsnpeawb.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/liblgsnpeawb_beta.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblgsnpeawb_beta.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libmorpho_image_stab31.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmorpho_image_stab31.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libmorpho_wdr2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmorpho_wdr2.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libmpbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmpbase.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/liboemcrypto.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liboemcrypto.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libops.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libops.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libqisl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libqisl.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/librmp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librmp.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/librpmb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/librpmb.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libsecureui.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libsecureui_svcsock.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsecureui_svcsock.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libsnsapi.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnsapi.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libspectre3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libspectre3.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libspl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libspl.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libsymphony-1.1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphony-1.1.4.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libsymphony-cpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphony-cpu.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libsymphonypower-1.1.4.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphonypower-1.1.4.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libsymphonypower.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphonypower.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libtzdrmgenprov.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtzdrmgenprov.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/libwebrtc_audio_preprocessing.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwebrtc_audio_preprocessing.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/rfsa/adsp/libsns_device_mode_skel.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/sensors.sar.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.sar.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
     vendor/lge/mh2lm/proprietary/vendor/lib64/vendor.lge.hardware.sensors@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.lge.hardware.sensors@1.0.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fingerprint@1.0.so \
-    vendor/lge/mh2lm/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qseecom@1.0.so
-
-PRODUCT_PACKAGES += \
-    manifest_android.hardware.drm@1.3-service.widevine
+    vendor/lge/mh2lm/proprietary/vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.fingerprint@1.0.so
diff --git a/proprietary/vendor/bin/cpfirmware b/proprietary/vendor/bin/cpfirmware
deleted file mode 100755
index e8c1f6b198b539f23c82cea8d4a80e834b6b74ca..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/bin/cpfirmware and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine b/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine
deleted file mode 100644
index f09267da203a664c4c94ca5ce332c52e5cc9d932..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service b/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
deleted file mode 100644
index 3209ffd6566c0b39a71471d7caca2958f284d34e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service and /dev/null differ
diff --git a/proprietary/vendor/bin/qseecomd b/proprietary/vendor/bin/qseecomd
deleted file mode 100755
index 0edaa3e5221b2dcad9de649c84abc5943b4c69de..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/bin/qseecomd and /dev/null differ
diff --git a/proprietary/vendor/etc/gpfspath_oem_config.xml b/proprietary/vendor/etc/gpfspath_oem_config.xml
deleted file mode 100644
index 61a4f6bd8e29644410515b047a6e594d1cfc3403..0000000000000000000000000000000000000000
--- a/proprietary/vendor/etc/gpfspath_oem_config.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-Copyright (c) 2017 Qualcomm Technologies, Inc.
-All Rights Reserved.
-Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-
-<!--
-
-This file is configured by OEM to customize the path used by GP FS listener
-service to save files, and will be located in /vendor/etc on device
-
-"gp_data_path" and "gp_persist_path" are the /data and /persist partition
-path to save files, respectively.
-By default, "gp_data_path" is "/data/vendor/tzstorage/", and
-"gp_persist_path" is "/mnt/vendor/persist/data/".
-
-To replace with different paths, please also create folder in init.qcom.rc
-file and update SEAndroid policy.
-
-Take "/data/vendor/tzstorage/" as an example below,
-
-A) rootdir/etc/init.qcom.rc:
-# Create /data/vendor/tzstorage directory for SFS listener
-mkdir /data/vendor/tzstorage 0770 system system
-
-B) common/file.te:
-# SFS listener data file
-type data_tzstorage_file, file_type, data_file_type;
-
-C) common/file_contexts:
-/data/vendor/tzstorage(/.*)?       u:object_r:data_tzstorage_file:s0
-
-D) common/qseecomd.te:
-# Allow SFS to write to data partition
-allow tee data_tzstorage_file:dir create_dir_perms;
-allow tee data_tzstorage_file:file create_file_perms;
-
-"gp_whitelist_count" and "gp_whitelist_path"
-
-Some paths needs "/data/vendor/tzstorage" appended to it at the beginning
-as they do not have access/permissions on their own.
-Use gp_whitelist_count and gp_whitelist_paths entries to add more such paths.
-By default, we add "/data/system/users" and "/data/misc/qsee" for current use
-cases.
-
-To add an extra path, increment the count in gp_whitelist_count and add a new
-gp_whitelist_path entry. It is very critical that the count matches with the
-number of path entries.
-
--->
-
-
-<sfs_path>
-    <gp_data_path> /data/vendor/tzstorage/ </gp_data_path>
-    <gp_persist_path> /mnt/vendor/persist-lg/data/ </gp_persist_path>
-    <gp_whitelist_count> 4 </gp_whitelist_count>
-    <gp_whitelist_path> /data/system/users/ </gp_whitelist_path>
-    <gp_whitelist_path> /data/misc/qsee/ </gp_whitelist_path>
-    <gp_whitelist_path> /qwes </gp_whitelist_path>
-    <gp_whitelist_path> /qwes/licenses </gp_whitelist_path>
-</sfs_path>
diff --git a/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc b/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
deleted file mode 100644
index 7dade15178b7a6d41c83dee7bbb863653c7dd17d..0000000000000000000000000000000000000000
--- a/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-on property:init.svc.mediadrm=running
-    mkdir /data/vendor/mediadrm 0770 media mediadrm
-    start vendor.move_data_sh
-
-service vendor.move_data_sh /system/bin/move_widevine_data.sh
-    class late_start
-    user media
-    group media mediadrm system
-    disabled
-    oneshot
-
-service vendor.drm-widevine-hal-1-3 /vendor/bin/hw/android.hardware.drm@1.3-service.widevine
-    interface android.hardware.drm@1.0::ICryptoFactory widevine
-    interface android.hardware.drm@1.0::IDrmFactory widevine
-    interface android.hardware.drm@1.1::ICryptoFactory widevine
-    interface android.hardware.drm@1.1::IDrmFactory widevine
-    interface android.hardware.drm@1.2::ICryptoFactory widevine
-    interface android.hardware.drm@1.2::IDrmFactory widevine
-    interface android.hardware.drm@1.3::ICryptoFactory widevine
-    interface android.hardware.drm@1.3::IDrmFactory widevine
-    interface android.hidl.base@1.0::IBase widevine
-    class hal
-    user media
-    group media mediadrm drmrpc system
-    ioprio rt 4
-    writepid /dev/cpuset/foreground/tasks
-    capabilities SYS_NICE
diff --git a/proprietary/vendor/etc/init/qseecomd.rc b/proprietary/vendor/etc/init/qseecomd.rc
deleted file mode 100644
index 841a9575cb73252cbdb1924cd1c7985bea051f60..0000000000000000000000000000000000000000
--- a/proprietary/vendor/etc/init/qseecomd.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-on init
-    wait /dev/qseecom
-    start vendor.qseecomd
-
-service vendor.qseecomd /vendor/bin/qseecomd
-    class core
-    user root
-    group root
diff --git a/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc b/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
deleted file mode 100644
index bae66582a7fca7a74fdff4c89ad09d7f3f69c229..0000000000000000000000000000000000000000
--- a/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Copyright (c) 2019 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-#
-
-on init
-    start qseecom-service
-
-service qseecom-service /vendor/bin/hw/vendor.qti.hardware.qseecom@1.0-service
-    class hal
-    user system
-    group system drmrpc
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml b/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
deleted file mode 100644
index f6f2d88545dc873a99e21147ea37b38cbca3da07..0000000000000000000000000000000000000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.3::ICryptoFactory/widevine</fqname>
-        <fqname>@1.3::IDrmFactory/widevine</fqname>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so
deleted file mode 100644
index d20d9b1359bbdeb7c8beac301a4658944bf7f5a5..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/hw/vendor.qti.hardware.qseecom@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libGPreqcancel.so b/proprietary/vendor/lib/libGPreqcancel.so
deleted file mode 100644
index bbb0fb12c12bab02261d06833906c7a2233d7c30..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libGPreqcancel.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libGPreqcancel_svc.so b/proprietary/vendor/lib/libGPreqcancel_svc.so
deleted file mode 100644
index 8f7c08d350dd628e5987408a19624b38f723d416..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libGPreqcancel_svc.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libQSEEComAPI.so b/proprietary/vendor/lib/libQSEEComAPI.so
deleted file mode 100644
index fec6eae4abfe437df8bc38c5db4e91cc757b5627..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libQSEEComAPI.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libSecureUILib.so b/proprietary/vendor/lib/libSecureUILib.so
deleted file mode 100644
index e573902197aa31312f444cf857923828b63b94a1..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libSecureUILib.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libStDrvInt.so b/proprietary/vendor/lib/libStDrvInt.so
deleted file mode 100644
index f3caafa72e802a0db5ac0dd8741b378868b6469e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libStDrvInt.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libbase64.so b/proprietary/vendor/lib/libbase64.so
deleted file mode 100644
index 0d74b0ac447bb8a6b37becd9fc9227fe16648571..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libbase64.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libcpion.so b/proprietary/vendor/lib/libcpion.so
deleted file mode 100644
index b29f220184f1e0ca19407cfbc5e3be13ea863368..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libcpion.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libdrmfs.so b/proprietary/vendor/lib/libdrmfs.so
deleted file mode 100644
index dc0610bf9b35872038ba47a0517fc4e4fc891ffc..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libdrmfs.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libdrmtime.so b/proprietary/vendor/lib/libdrmtime.so
deleted file mode 100644
index 126daeeaae5c7dd7cdf2d8aea8d0a42264a49d34..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libdrmtime.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libhdcpsrm.so b/proprietary/vendor/lib/libhdcpsrm.so
deleted file mode 100644
index fdc690925864345a2c0fac633aea60d234c04c30..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libhdcpsrm.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libmmosal.so b/proprietary/vendor/lib/libmmosal.so
deleted file mode 100644
index 748a5ee2c2597dd1d1c0c7c7d836d2ed8ee8c1f5..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libmmosal.so and /dev/null differ
diff --git a/proprietary/vendor/lib/liboemcrypto.so b/proprietary/vendor/lib/liboemcrypto.so
deleted file mode 100644
index c837cb99c09e456a4120ce545c0f818da1137a97..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/liboemcrypto.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libops.so b/proprietary/vendor/lib/libops.so
deleted file mode 100644
index 7f5616b2682ef3eeab44e093b91b0def356fe13b..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libops.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libqisl.so b/proprietary/vendor/lib/libqisl.so
deleted file mode 100644
index 5ba17426ae16fcec2bdb44b9643560842544ecb0..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libqisl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/librmp.so b/proprietary/vendor/lib/librmp.so
deleted file mode 100644
index fde7e48e2e75ee35461429db2624fe377f20d6a9..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/librmp.so and /dev/null differ
diff --git a/proprietary/vendor/lib/librpmb.so b/proprietary/vendor/lib/librpmb.so
deleted file mode 100644
index 1e708939c23571258f84c7a300419ff2603fa8d6..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/librpmb.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsecureui.so b/proprietary/vendor/lib/libsecureui.so
deleted file mode 100644
index 8c77ac2411e931122bc14f6f12f9e3742689d02f..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libsecureui.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsecureui_svcsock.so b/proprietary/vendor/lib/libsecureui_svcsock.so
deleted file mode 100644
index 9263eb4e3383615aaa4ed297ad76dad7d81191d2..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libsecureui_svcsock.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libspl.so b/proprietary/vendor/lib/libspl.so
deleted file mode 100644
index f11154a7a3e9a6ef90a7c40568dc91ec86d1d28e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libspl.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libssd.so b/proprietary/vendor/lib/libssd.so
deleted file mode 100644
index cbff2cbf945be4f3a2fe4a3dd58e9e59adde18b5..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libssd.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libtrustedapploader.so b/proprietary/vendor/lib/libtrustedapploader.so
deleted file mode 100644
index c85e67a57196e5c57aee603da8dd9af315f7db6e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libtrustedapploader.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libtzdrmgenprov.so b/proprietary/vendor/lib/libtzdrmgenprov.so
deleted file mode 100644
index 922ed0dab7a6c1aa1dd0d1a2f696420c62888fe7..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libtzdrmgenprov.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
deleted file mode 100644
index 25b7bbf8c0370ac8bd1a822ecb8c53a96daed00a..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
deleted file mode 100644
index f8b1100a31f4d7fd2dc1c676c70ef296eb08189a..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdmmservice_proprietary.so b/proprietary/vendor/lib/libwfdmmservice_proprietary.so
deleted file mode 100644
index f1768f29011cf0fd24088d2dbfad87dd6bf8fd6e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libwfdmmservice_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libwfdutils_proprietary.so b/proprietary/vendor/lib/libwfdutils_proprietary.so
deleted file mode 100644
index e275f005e9d710daf064f6f6201a854854982f34..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/libwfdutils_proprietary.so and /dev/null differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so
deleted file mode 100644
index 1dc305f078f02bf3e798d1b20d224555156400e4..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib/vendor.qti.hardware.qseecom@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
deleted file mode 100644
index 5506663284b73b3716dc4a6249239ba088543696..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel.so b/proprietary/vendor/lib64/libGPreqcancel.so
deleted file mode 100644
index 647b1e88c976273da50304e393e438cc83740139..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libGPreqcancel.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libGPreqcancel_svc.so b/proprietary/vendor/lib64/libGPreqcancel_svc.so
deleted file mode 100644
index 70476dc807dad48ac8f79237c4fd257487689147..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libGPreqcancel_svc.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libQSEEComAPI.so b/proprietary/vendor/lib64/libQSEEComAPI.so
deleted file mode 100644
index be8ea24907b086f797d36c056759ed3ea25bc98d..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libQSEEComAPI.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSecureUILib.so b/proprietary/vendor/lib64/libSecureUILib.so
deleted file mode 100644
index 6f84e813602114ddbbebd7243815d77be0d55fa4..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libSecureUILib.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libStDrvInt.so b/proprietary/vendor/lib64/libStDrvInt.so
deleted file mode 100644
index 449a4a8835d3eedc8fb79c62d081da7fc50d862c..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libStDrvInt.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libbase64.so b/proprietary/vendor/lib64/libbase64.so
deleted file mode 100644
index 0aee4cbddb25a1ff8ba0537d45e77bf4a2197129..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libbase64.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libcpion.so b/proprietary/vendor/lib64/libcpion.so
deleted file mode 100644
index f47d0aaab35f1ea61576a005e150ac1740db3e54..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libcpion.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdrmfs.so b/proprietary/vendor/lib64/libdrmfs.so
deleted file mode 100644
index dc6988c0eaa07a80a3d0385ea999a789afdf455b..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libdrmfs.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdrmtime.so b/proprietary/vendor/lib64/libdrmtime.so
deleted file mode 100644
index 5855910eaa457e3398aae81546744923f89b1d9b..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libdrmtime.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libhdcpsrm.so b/proprietary/vendor/lib64/libhdcpsrm.so
deleted file mode 100644
index c31f6fa51bf3f0bac8e5e343a0c1d90ec14187a4..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libhdcpsrm.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libmmosal.so b/proprietary/vendor/lib64/libmmosal.so
deleted file mode 100644
index 0aab6fcb9802cc4a5b491dd96bc24c332798e3e8..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libmmosal.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/liboemcrypto.so b/proprietary/vendor/lib64/liboemcrypto.so
deleted file mode 100644
index f6f5a405d2a15a43dd831128db28d784620d6c05..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/liboemcrypto.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libops.so b/proprietary/vendor/lib64/libops.so
deleted file mode 100644
index 8b7a7b883a9867f131daab32335defd055b2fba5..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libops.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libqisl.so b/proprietary/vendor/lib64/libqisl.so
deleted file mode 100644
index e0edd58b2062d0217d53a88f8da3a5ab27475162..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libqisl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/librmp.so b/proprietary/vendor/lib64/librmp.so
deleted file mode 100644
index 63f30294769a67ce0cddbb39d55b6e0a8885e237..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/librmp.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/librpmb.so b/proprietary/vendor/lib64/librpmb.so
deleted file mode 100644
index 4fe602cac32ed02d429934e2b99cb6d0d2689569..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/librpmb.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsecureui.so b/proprietary/vendor/lib64/libsecureui.so
deleted file mode 100644
index 57cf9e65d514900e8460ebcadfc7e753742e49e4..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libsecureui.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsecureui_svcsock.so b/proprietary/vendor/lib64/libsecureui_svcsock.so
deleted file mode 100644
index 77fa8c20a308852744e54149e3d6dc342319979f..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libsecureui_svcsock.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libspl.so b/proprietary/vendor/lib64/libspl.so
deleted file mode 100644
index 605e51299a7a16c4f552435cf46f45a0d8593660..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libspl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libssd.so b/proprietary/vendor/lib64/libssd.so
deleted file mode 100644
index fd22208fd301cf343a957467dcf2f135fc54fec0..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libssd.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libtzdrmgenprov.so b/proprietary/vendor/lib64/libtzdrmgenprov.so
deleted file mode 100644
index 7fd6eff53dfd4f45979df5e4d3f33de145c2fb4e..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libtzdrmgenprov.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so
deleted file mode 100644
index bccca153f0078b88fc9255707f40ef2e3c9c635d..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/libwvhidl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so
deleted file mode 100644
index 49f73361cc176b1350aefd228a46360422aa0e59..0000000000000000000000000000000000000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.qseecom@1.0.so and /dev/null differ