diff --git a/proprietary/vendor/lib/libAlacSwDec.so b/proprietary/vendor/lib/libAlacSwDec.so
deleted file mode 100644
index 14526e4..0000000
Binary files a/proprietary/vendor/lib/libAlacSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libApeSwDec.so b/proprietary/vendor/lib/libApeSwDec.so
deleted file mode 100644
index 08bedfe..0000000
Binary files a/proprietary/vendor/lib/libApeSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libFlacSwDec.so b/proprietary/vendor/lib/libFlacSwDec.so
deleted file mode 100644
index fab1db1..0000000
Binary files a/proprietary/vendor/lib/libFlacSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libMpeg4SwEncoder.so b/proprietary/vendor/lib/libMpeg4SwEncoder.so
deleted file mode 100644
index 9d18611..0000000
Binary files a/proprietary/vendor/lib/libMpeg4SwEncoder.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libMpeghSwEnc.so b/proprietary/vendor/lib/libMpeghSwEnc.so
deleted file mode 100644
index 1a0e0db..0000000
Binary files a/proprietary/vendor/lib/libMpeghSwEnc.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAlacDecSw.so b/proprietary/vendor/lib/libOmxAlacDecSw.so
deleted file mode 100644
index 0868ff0..0000000
Binary files a/proprietary/vendor/lib/libOmxAlacDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxApeDecSw.so b/proprietary/vendor/lib/libOmxApeDecSw.so
deleted file mode 100644
index e226458..0000000
Binary files a/proprietary/vendor/lib/libOmxApeDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxMpeghDecSw.so b/proprietary/vendor/lib/libOmxMpeghDecSw.so
deleted file mode 100644
index aaf244a..0000000
Binary files a/proprietary/vendor/lib/libOmxMpeghDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxMpeghEncSw.so b/proprietary/vendor/lib/libOmxMpeghEncSw.so
deleted file mode 100644
index 074bb03..0000000
Binary files a/proprietary/vendor/lib/libOmxMpeghEncSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxSwVdec.so b/proprietary/vendor/lib/libOmxSwVdec.so
deleted file mode 100644
index 3a25850..0000000
Binary files a/proprietary/vendor/lib/libOmxSwVdec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxSwVencMpeg4.so b/proprietary/vendor/lib/libOmxSwVencMpeg4.so
deleted file mode 100644
index 77308c4..0000000
Binary files a/proprietary/vendor/lib/libOmxSwVencMpeg4.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libswvdec.so b/proprietary/vendor/lib/libswvdec.so
deleted file mode 100644
index 452968b..0000000
Binary files a/proprietary/vendor/lib/libswvdec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libAlacSwDec.so b/proprietary/vendor/lib64/libAlacSwDec.so
deleted file mode 100644
index d954314..0000000
Binary files a/proprietary/vendor/lib64/libAlacSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libApeSwDec.so b/proprietary/vendor/lib64/libApeSwDec.so
deleted file mode 100644
index d64cf0e..0000000
Binary files a/proprietary/vendor/lib64/libApeSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libFlacSwDec.so b/proprietary/vendor/lib64/libFlacSwDec.so
deleted file mode 100644
index 2e57c7c..0000000
Binary files a/proprietary/vendor/lib64/libFlacSwDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libMpeg4SwEncoder.so b/proprietary/vendor/lib64/libMpeg4SwEncoder.so
deleted file mode 100644
index 9acb9ab..0000000
Binary files a/proprietary/vendor/lib64/libMpeg4SwEncoder.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libMpeghSwEnc.so b/proprietary/vendor/lib64/libMpeghSwEnc.so
deleted file mode 100644
index fa27bfe..0000000
Binary files a/proprietary/vendor/lib64/libMpeghSwEnc.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDecSw.so b/proprietary/vendor/lib64/libOmxAlacDecSw.so
deleted file mode 100644
index 4700c71..0000000
Binary files a/proprietary/vendor/lib64/libOmxAlacDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxApeDecSw.so b/proprietary/vendor/lib64/libOmxApeDecSw.so
deleted file mode 100644
index 58954f6..0000000
Binary files a/proprietary/vendor/lib64/libOmxApeDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libswvdec.so b/proprietary/vendor/lib64/libswvdec.so
deleted file mode 100644
index a3e5ace..0000000
Binary files a/proprietary/vendor/lib64/libswvdec.so and /dev/null differ
diff --git a/sm6225-common-vendor.mk b/sm6225-common-vendor.mk
index 9d50563..c907e4b 100644
--- a/sm6225-common-vendor.mk
+++ b/sm6225-common-vendor.mk
@@ -203,28 +203,17 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vendor.qti.hardware.bluetooth_audio@2.1-impl.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/hw/vulkan.adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib/hw/vulkan.adreno.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libApeSwDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib/libC2D2.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib/libCB.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeg4SwEncoder.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMpeghSwEnc.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAacDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrwbplusDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxEvrcDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxG711Dec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxMpeghDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghDecSw.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxMpeghEncSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxMpeghEncSw.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxQcelp13Dec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxSwVdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVdec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxSwVencMpeg4.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxSwVencMpeg4.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libOpenCL.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCL.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libVkLayer_q3dtools.so:$(TARGET_COPY_OUT_VENDOR)/lib/libVkLayer_q3dtools.so \
@@ -283,7 +272,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libscveObjectTracker_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib/libscveObjectTracker_stub.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libsdsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsdsprpc.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libsurround_3mic_proc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsurround_3mic_proc.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libswvdec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib/libsysmon_cdsp_skel.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_Classic.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so:$(TARGET_COPY_OUT_VENDOR)/lib/rfsa/adsp/capi_v2_aptX_HD.so \
@@ -344,22 +332,15 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/lib-rtpcommon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcommon.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/lib-rtpcore.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpcore.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/lib-rtpsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib-rtpsl.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAlacSwDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libApeSwDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libC2D2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libC2D2.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libCB.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libCB.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libFlacSwDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libGPreqcancel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libGPreqcancel_svc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libGPreqcancel_svc.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libMpeg4SwEncoder.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeg4SwEncoder.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libMpeghSwEnc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMpeghSwEnc.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAacDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAlacDecSw.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxAmrwbplusDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDec.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxApeDecSw.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxEvrcDec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxG711Dec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOmxQcelp13Dec.so \
@@ -501,7 +482,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libssc_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc_default_listener.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libssd.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssd.so \
-    vendor/motorola/sm6225-common/proprietary/vendor/lib64/libswvdec.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswvdec.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libsysmon_cdsp_skel.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsysmon_cdsp_skel.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libsystem_health_mon.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsystem_health_mon.so \
     vendor/motorola/sm6225-common/proprietary/vendor/lib64/libtime_genoff.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtime_genoff.so \