diff --git a/Android.bp b/Android.bp
index 4fe5eb0..92116bb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2803,283 +2803,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libOmxAacDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAlacDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAlacDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxAmrwbplusDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxAmrwbplusDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxApeDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxApeDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxDsdDec",
-    owner: "xiaomi",
-    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: "libOmxEvrcDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxEvrcDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxQcelp13Dec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxQcelp13Dec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxVpp",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxVpp.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libutils",
-                "libbinder",
-                "libcutils",
-                "libvppclient",
-                "vendor.qti.hardware.vpp@1.1",
-                "vendor.qti.hardware.vpp@1.2",
-                "vendor.qti.hardware.capabilityconfigstore@1.0",
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    check_elf_files: false,
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libOmxWmaDec",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libOmxWmaDec.so",
-            ],
-            shared_libs: [
-                "libutils",
-                "liblog",
-                "libion",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "liba2dpoffload",
     owner: "xiaomi",
@@ -3280,31 +3003,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libdsd2pcm",
-    owner: "xiaomi",
-    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: "libmulawdec",
     owner: "xiaomi",
diff --git a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk
index ddc095b..1773210 100644
Binary files a/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk and b/proprietary/product/app/PowerOffAlarm/PowerOffAlarm.apk differ
diff --git a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
index c7669dd..5c83748 100644
Binary files a/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk and b/proprietary/system_ext/app/QtiTelephonyService/QtiTelephonyService.apk differ
diff --git a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk
index a4815da..82cb31c 100644
Binary files a/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk and b/proprietary/system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk differ
diff --git a/proprietary/system_ext/priv-app/ims/ims.apk b/proprietary/system_ext/priv-app/ims/ims.apk
index 889441c..d0c8a2c 100644
Binary files a/proprietary/system_ext/priv-app/ims/ims.apk and b/proprietary/system_ext/priv-app/ims/ims.apk differ
diff --git a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
index 0cf4d8e..fd61b87 100644
Binary files a/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk and b/proprietary/system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk differ
diff --git a/proprietary/vendor/app/CACertService/CACertService.apk b/proprietary/vendor/app/CACertService/CACertService.apk
index 40cab84..c5df346 100644
Binary files a/proprietary/vendor/app/CACertService/CACertService.apk and b/proprietary/vendor/app/CACertService/CACertService.apk differ
diff --git a/proprietary/vendor/app/CneApp/CneApp.apk b/proprietary/vendor/app/CneApp/CneApp.apk
index dbdbe4d..35adc00 100644
Binary files a/proprietary/vendor/app/CneApp/CneApp.apk and b/proprietary/vendor/app/CneApp/CneApp.apk differ
diff --git a/proprietary/vendor/app/IWlanService/IWlanService.apk b/proprietary/vendor/app/IWlanService/IWlanService.apk
index 8f7772e..dabd572 100644
Binary files a/proprietary/vendor/app/IWlanService/IWlanService.apk and b/proprietary/vendor/app/IWlanService/IWlanService.apk differ
diff --git a/proprietary/vendor/app/SoterService/SoterService.apk b/proprietary/vendor/app/SoterService/SoterService.apk
index 7924d47..16b1db1 100644
Binary files a/proprietary/vendor/app/SoterService/SoterService.apk and b/proprietary/vendor/app/SoterService/SoterService.apk differ
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
index e6bae8e..cd3a02c 100644
Binary files a/proprietary/vendor/app/TimeService/TimeService.apk and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/lib/libOmxAacDec.so b/proprietary/vendor/lib/libOmxAacDec.so
deleted file mode 100644
index 858096e..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 d23a5b1..0000000
Binary files a/proprietary/vendor/lib/libOmxAlacDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAmrDec.so b/proprietary/vendor/lib/libOmxAmrDec.so
deleted file mode 100644
index c1f9c15..0000000
Binary files a/proprietary/vendor/lib/libOmxAmrDec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/proprietary/vendor/lib/libOmxAmrwbplusDec.so
deleted file mode 100644
index d18ed60..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 b020499..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 53864e7..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 38d5460..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 11e6863..0000000
Binary files a/proprietary/vendor/lib/libOmxQcelp13Dec.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxVpp.so b/proprietary/vendor/lib/libOmxVpp.so
deleted file mode 100644
index 403aa89..0000000
Binary files a/proprietary/vendor/lib/libOmxVpp.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libOmxWmaDec.so b/proprietary/vendor/lib/libOmxWmaDec.so
deleted file mode 100644
index 4cf8ed7..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 70e0d6c..0000000
Binary files a/proprietary/vendor/lib/libdsd2pcm.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/fingerprint.fpc.sm6150.so b/proprietary/vendor/lib64/hw/fingerprint.fpc.sm6150.so
index ae8fa55..7ae3205 100644
Binary files a/proprietary/vendor/lib64/hw/fingerprint.fpc.sm6150.so and b/proprietary/vendor/lib64/hw/fingerprint.fpc.sm6150.so differ
diff --git a/proprietary/vendor/lib64/hw/fingerprint.goodix.sm6150.so b/proprietary/vendor/lib64/hw/fingerprint.goodix.sm6150.so
index 1c77aa9..c0ff25b 100644
Binary files a/proprietary/vendor/lib64/hw/fingerprint.goodix.sm6150.so and b/proprietary/vendor/lib64/hw/fingerprint.goodix.sm6150.so differ
diff --git a/surya-vendor.mk b/surya-vendor.mk
index 8af97bb..808e09e 100644
--- a/surya-vendor.mk
+++ b/surya-vendor.mk
@@ -333,16 +333,6 @@ PRODUCT_PACKAGES += \
     audio.primary.sm6150 \
     sound_trigger.primary.sm6150 \
     vendor.qti.hardware.bluetooth_audio@2.1-impl \
-    libOmxAacDec \
-    libOmxAlacDec \
-    libOmxAmrDec \
-    libOmxAmrwbplusDec \
-    libOmxApeDec \
-    libOmxDsdDec \
-    libOmxEvrcDec \
-    libOmxQcelp13Dec \
-    libOmxVpp \
-    libOmxWmaDec \
     liba2dpoffload \
     libadm \
     libadpcmdec \
@@ -350,7 +340,6 @@ PRODUCT_PACKAGES += \
     libbluetooth_audio_session_qti \
     libbluetooth_audio_session_qti_2_1 \
     libdrc \
-    libdsd2pcm \
     libmulawdec \
     libqcodec2 \
     libsmwrapper \