diff --git a/Android.bp b/Android.bp
index 36e52f4..ebaf102 100644
--- a/Android.bp
+++ b/Android.bp
@@ -753,23 +753,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libMpeg4SwEncoder",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libMpeg4SwEncoder.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOmxAacDec",
 	owner: "xiaomi",
@@ -804,23 +787,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxAlacDecSw",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxAlacDecSw.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOmxAmrDec",
 	owner: "xiaomi",
@@ -872,23 +838,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxApeDecSw",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxApeDecSw.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOmxDsdDec",
 	owner: "xiaomi",
@@ -940,40 +889,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxSwVdec",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxSwVdec.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxSwVencMpeg4",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxSwVencMpeg4.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOmxVpp",
 	owner: "xiaomi",
@@ -1127,23 +1042,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libswvdec",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libswvdec.so"],
-		},
-	},
-	compile_multilib: "32",
-	check_elf_files: false,
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libvppclient",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/lib/libMpeg4SwEncoder.so b/proprietary/vendor/lib/libMpeg4SwEncoder.so
deleted file mode 100644
index 232409b..0000000
Binary files a/proprietary/vendor/lib/libMpeg4SwEncoder.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAlacDecSw.so b/proprietary/vendor/lib/libOmxAlacDecSw.so
deleted file mode 100644
index b00223d..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 5202430..0000000
Binary files a/proprietary/vendor/lib/libOmxApeDecSw.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxSwVdec.so b/proprietary/vendor/lib/libOmxSwVdec.so
deleted file mode 100644
index 6b0c0ff..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 3085bcc..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 743721b..0000000
Binary files a/proprietary/vendor/lib/libswvdec.so and /dev/null differ
diff --git a/sm6150-common-vendor.mk b/sm6150-common-vendor.mk
index 8bca0fa..2502595 100644
--- a/sm6150-common-vendor.mk
+++ b/sm6150-common-vendor.mk
@@ -135,19 +135,14 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.vpp@1.2 \
     vendor.qti.hardware.vpp@1.3 \
     vendor.qti.hardware.bluetooth_audio@2.1-impl \
-    libMpeg4SwEncoder \
     libOmxAacDec \
     libOmxAlacDec \
-    libOmxAlacDecSw \
     libOmxAmrDec \
     libOmxAmrwbplusDec \
     libOmxApeDec \
-    libOmxApeDecSw \
     libOmxDsdDec \
     libOmxEvrcDec \
     libOmxQcelp13Dec \
-    libOmxSwVdec \
-    libOmxSwVencMpeg4 \
     libOmxVpp \
     libOmxWmaDec \
     libadpcmdec \
@@ -157,7 +152,6 @@ PRODUCT_PACKAGES += \
     libqcodec2 \
     librice \
     libsmwrapper \
-    libswvdec \
     libvppclient \
     libasphere \
     libshoebox \