diff --git a/Android.bp b/Android.bp
index 16118f2..6713589 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1480,90 +1480,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxAacDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxAacDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxAacDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxAlacDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxAlacDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxAlacDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxAmrwbplusDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxAmrwbplusDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxAmrwbplusDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxApeDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxApeDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxApeDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOmxBlackBar",
 	owner: "samsung",
@@ -1585,69 +1501,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxEvrcDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxEvrcDec.so"],
-			shared_libs: ["libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxEvrcDec.so"],
-			shared_libs: ["libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxQcelp13Dec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxQcelp13Dec.so"],
-			shared_libs: ["libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxQcelp13Dec.so"],
-			shared_libs: ["libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "libOmxWmaDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxWmaDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libOmxWmaDec.so"],
-			shared_libs: ["libutils", "liblog", "libion", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libOpenCL",
 	owner: "samsung",
@@ -4966,27 +4819,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libstagefright_soft_qtiflacdec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libstagefright_soft_qtiflacdec.so"],
-			shared_libs: ["libstagefright_softomx", "libstagefright_foundation", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libstagefright_soft_qtiflacdec.so"],
-			shared_libs: ["libstagefright_softomx", "libstagefright_foundation", "libutils", "liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "both",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libswregistrationalgo",
 	owner: "samsung",
@@ -6221,23 +6053,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libOmxDsdDec",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libOmxDsdDec.so"],
-			shared_libs: ["libutils", "liblog", "libcutils", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "32",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "lib_SamsungRec_07010",
 	owner: "samsung",
@@ -6446,23 +6261,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libdsd2pcm",
-	owner: "samsung",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm: {
-			srcs: ["proprietary/vendor/lib/libdsd2pcm.so"],
-			shared_libs: ["liblog", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "32",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libexthwplugin_vendor",
 	stem: "libexthwplugin",
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
deleted file mode 100644
index ad9b65b..0000000
Binary files a/proprietary/vendor/lib/libOmxAacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAlacDec.so b/proprietary/vendor/lib/libOmxAlacDec.so
deleted file mode 100644
index 5f2a42c..0000000
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
deleted file mode 100644
index 0052454..0000000
Binary files a/proprietary/vendor/lib/libOmxAmrwbplusDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxApeDec.so b/proprietary/vendor/lib/libOmxApeDec.so
deleted file mode 100644
index dcf69a1..0000000
Binary files a/proprietary/vendor/lib/libOmxApeDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxDsdDec.so b/proprietary/vendor/lib/libOmxDsdDec.so
deleted file mode 100644
index c28ae75..0000000
Binary files a/proprietary/vendor/lib/libOmxDsdDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxEvrcDec.so b/proprietary/vendor/lib/libOmxEvrcDec.so
deleted file mode 100644
index dd017bb..0000000
Binary files a/proprietary/vendor/lib/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxQcelp13Dec.so b/proprietary/vendor/lib/libOmxQcelp13Dec.so
deleted file mode 100644
index 9b348e6..0000000
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxWmaDec.so b/proprietary/vendor/lib/libOmxWmaDec.so
deleted file mode 100644
index d3b7ea6..0000000
Binary files a/proprietary/vendor/lib/libOmxWmaDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libdsd2pcm.so b/proprietary/vendor/lib/libdsd2pcm.so
deleted file mode 100644
index 54bda6b..0000000
Binary files a/proprietary/vendor/lib/libdsd2pcm.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libstagefright_soft_qtiflacdec.so b/proprietary/vendor/lib/libstagefright_soft_qtiflacdec.so
deleted file mode 100644
index 4c5cf5b..0000000
Binary files a/proprietary/vendor/lib/libstagefright_soft_qtiflacdec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAacDec.so b/proprietary/vendor/lib64/libOmxAacDec.so
deleted file mode 100644
index 456e249..0000000
Binary files a/proprietary/vendor/lib64/libOmxAacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAlacDec.so b/proprietary/vendor/lib64/libOmxAlacDec.so
deleted file mode 100644
index ad7b978..0000000
Binary files a/proprietary/vendor/lib64/libOmxAlacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so b/proprietary/vendor/lib64/libOmxAmrwbplusDec.so
deleted file mode 100644
index 783a2c3..0000000
Binary files a/proprietary/vendor/lib64/libOmxAmrwbplusDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxApeDec.so b/proprietary/vendor/lib64/libOmxApeDec.so
deleted file mode 100644
index 291d02d..0000000
Binary files a/proprietary/vendor/lib64/libOmxApeDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxEvrcDec.so b/proprietary/vendor/lib64/libOmxEvrcDec.so
deleted file mode 100644
index 85384b5..0000000
Binary files a/proprietary/vendor/lib64/libOmxEvrcDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxQcelp13Dec.so b/proprietary/vendor/lib64/libOmxQcelp13Dec.so
deleted file mode 100644
index e4d76a2..0000000
Binary files a/proprietary/vendor/lib64/libOmxQcelp13Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOmxWmaDec.so b/proprietary/vendor/lib64/libOmxWmaDec.so
deleted file mode 100644
index 014dcb6..0000000
Binary files a/proprietary/vendor/lib64/libOmxWmaDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libstagefright_soft_qtiflacdec.so b/proprietary/vendor/lib64/libstagefright_soft_qtiflacdec.so
deleted file mode 100644
index 9d79fdd..0000000
Binary files a/proprietary/vendor/lib64/libstagefright_soft_qtiflacdec.so and /dev/null differ
diff --git a/sm7125-common-vendor.mk b/sm7125-common-vendor.mk
index 0b82e10..ccd1ff4 100644
--- a/sm7125-common-vendor.mk
+++ b/sm7125-common-vendor.mk
@@ -229,14 +229,7 @@ PRODUCT_PACKAGES += \
     libGPTEE_vendor \
     libGPreqcancel \
     libGPreqcancel_svc \
-    libOmxAacDec \
-    libOmxAlacDec \
-    libOmxAmrwbplusDec \
-    libOmxApeDec \
     libOmxBlackBar \
-    libOmxEvrcDec \
-    libOmxQcelp13Dec \
-    libOmxWmaDec \
     libOpenCL \
     libQSEEComAPI \
     libSecureUILib \
@@ -395,7 +388,6 @@ PRODUCT_PACKAGES += \
     libssc \
     libssc_default_listener \
     libssd \
-    libstagefright_soft_qtiflacdec \
     libswregistrationalgo \
     libsynergy_loc_api \
     libsysmon_cdsp_skel \
@@ -456,7 +448,6 @@ PRODUCT_PACKAGES += \
     com.samsung.node.uniplugin_preview \
     libMOTION \
     audio.primary.atoll \
-    libOmxDsdDec \
     lib_SamsungRec_07010 \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
@@ -469,7 +460,6 @@ PRODUCT_PACKAGES += \
     libcirrusspkrprot_vendor \
     libcomprcapture_vendor \
     libdrc \
-    libdsd2pcm \
     libexthwplugin_vendor \
     libhdmiedid_vendor \
     libhdmipassthru_vendor \