diff --git a/Android.bp b/Android.bp
index abe9ccf..b71fcff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8988,57 +8988,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsnsdiaglog",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsnsdiaglog.so",
-            ],
-            shared_libs: [
-                "libprotobuf-cpp-lite-3.9.1-vendorcompat",
-                "liblog",
-                "libdiag",
-                "libsensorslog",
-                "libutils",
-                "libcutils",
-                "libssc",
-                "libsnsapi",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsnsdiaglog.so",
-            ],
-            shared_libs: [
-                "libprotobuf-cpp-lite-3.9.1-vendorcompat",
-                "liblog",
-                "libdiag",
-                "libsensorslog",
-                "libutils",
-                "libcutils",
-                "libssc",
-                "libsnsapi",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libswregistrationalgo",
     owner: "motorola",
@@ -9125,57 +9074,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libvideooptfeature",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libvideooptfeature.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libbinder",
-                "libtinyxml2",
-                "libpowercore",
-                "libdisplayconfig.qti",
-                "libhidlbase",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libvideooptfeature.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libbinder",
-                "libtinyxml2",
-                "libpowercore",
-                "libdisplayconfig.qti",
-                "libhidlbase",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvidhance",
     owner: "motorola",
@@ -9543,32 +9441,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libc2d_helper",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libc2d_helper.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libC2D2",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcamxifestriping",
     owner: "motorola",
@@ -9748,61 +9620,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsensorslog",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsensorslog.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libsnsapi",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libsnsapi.so",
-            ],
-            shared_libs: [
-                "libprotobuf-cpp-lite-3.9.1-vendorcompat",
-                "libcutils",
-                "libutils",
-                "libqmi_common_so",
-                "libqmi_cci",
-                "libqmi_encdec",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libvideoutils",
     owner: "motorola",
@@ -10377,51 +10194,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "motorola.hardware.camera.imgtuner@2.0",
-    owner: "motorola",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system_ext/lib/motorola.hardware.camera.imgtuner@2.0.so",
-            ],
-            shared_libs: [
-                "motorola.hardware.camera.imgtuner@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/motorola.hardware.camera.imgtuner@2.0.so",
-            ],
-            shared_libs: [
-                "motorola.hardware.camera.imgtuner@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.seccam@1.0",
     owner: "motorola",
diff --git a/bangkk-vendor.mk b/bangkk-vendor.mk
index 03fde56..9949881 100644
--- a/bangkk-vendor.mk
+++ b/bangkk-vendor.mk
@@ -387,10 +387,8 @@ PRODUCT_PACKAGES += \
     libsns_device_mode_stub \
     libsns_fastRPC_util \
     libsns_low_lat_stream_stub \
-    libsnsdiaglog \
     libswregistrationalgo \
     libundistort_impl \
-    libvideooptfeature \
     libvidhance \
     motorola.hardware.camera.desktop@1.0 \
     motorola.hardware.camera.desktop@2.0 \
@@ -398,13 +396,10 @@ PRODUCT_PACKAGES += \
     motorola.hardware.camera.imgtuner@2.0 \
     vendor.qti.hardware.camera.postproc@1.0-service-impl \
     libaidenoiser \
-    libc2d_helper \
     libcamxifestriping \
     libipebpsstriping \
     libipebpsstriping170 \
     liblowlight_ai_portrait.arcsoft \
-    libsensorslog \
-    libsnsapi \
     libvideoutils \
     com.arcsoft.node.supernightraw \
     libdepthmapwrapper_secure \
@@ -421,7 +416,6 @@ PRODUCT_PACKAGES += \
     libarcsoft_calibverify_TriCamera \
     libarcsoft_tricam_calibration \
     libarcsoft_tricam_verification \
-    motorola.hardware.camera.imgtuner@2.0 \
     vendor.qti.hardware.seccam@1.0 \
     MotoSignatureApp \
     EuiccPartnerApp \
diff --git a/proprietary/system_ext/lib/motorola.hardware.camera.imgtuner@2.0.so b/proprietary/system_ext/lib/motorola.hardware.camera.imgtuner@2.0.so
deleted file mode 100644
index ea8dc1b..0000000
Binary files a/proprietary/system_ext/lib/motorola.hardware.camera.imgtuner@2.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/motorola.hardware.camera.imgtuner@2.0.so b/proprietary/system_ext/lib64/motorola.hardware.camera.imgtuner@2.0.so
deleted file mode 100644
index 16178e0..0000000
Binary files a/proprietary/system_ext/lib64/motorola.hardware.camera.imgtuner@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libc2d_helper.so b/proprietary/vendor/lib/libc2d_helper.so
deleted file mode 100644
index 4809226..0000000
Binary files a/proprietary/vendor/lib/libc2d_helper.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsensorslog.so b/proprietary/vendor/lib/libsensorslog.so
deleted file mode 100644
index 06ae481..0000000
Binary files a/proprietary/vendor/lib/libsensorslog.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsnsapi.so b/proprietary/vendor/lib/libsnsapi.so
deleted file mode 100644
index 51bb25b..0000000
Binary files a/proprietary/vendor/lib/libsnsapi.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libsnsdiaglog.so b/proprietary/vendor/lib/libsnsdiaglog.so
deleted file mode 100644
index c5ef359..0000000
Binary files a/proprietary/vendor/lib/libsnsdiaglog.so and /dev/null differ
diff --git a/proprietary/vendor/lib/libvideooptfeature.so b/proprietary/vendor/lib/libvideooptfeature.so
deleted file mode 100644
index 61d925e..0000000
Binary files a/proprietary/vendor/lib/libvideooptfeature.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsnsdiaglog.so b/proprietary/vendor/lib64/libsnsdiaglog.so
deleted file mode 100644
index 67d1953..0000000
Binary files a/proprietary/vendor/lib64/libsnsdiaglog.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libvideooptfeature.so b/proprietary/vendor/lib64/libvideooptfeature.so
deleted file mode 100644
index e8d1352..0000000
Binary files a/proprietary/vendor/lib64/libvideooptfeature.so and /dev/null differ