diff --git a/Android.bp b/Android.bp
index 8df6bd8..a67d739 100644
--- a/Android.bp
+++ b/Android.bp
@@ -159,86 +159,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.aidlbgservice-V1-ndk",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system_ext/lib/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so",
-            ],
-            shared_libs: [
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so",
-            ],
-            shared_libs: [
-                "libbinder_ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.xiaomi.hardware.bgservice@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/system_ext/lib/vendor.xiaomi.hardware.bgservice@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.xiaomi.hardware.bgservice@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.xiaomi.hardware.misys@1.0",
     owner: "xiaomi",
@@ -556,6 +476,61 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.aidlbgservice-V1-ndk-system_ext",
+    stem: "vendor.xiaomi.hardware.aidlbgservice-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.xiaomi.hardware.bgservice@1.0-system_ext",
+    stem: "vendor.xiaomi.hardware.bgservice@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.xiaomi.hardware.bgservice@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.xiaomi.hardware.misys.common-V3-ndk-system_ext",
     stem: "vendor.xiaomi.hardware.misys.common-V3-ndk",
diff --git a/klee-miuicamera-vendor.mk b/klee-miuicamera-vendor.mk
index b5b29b6..d48f2c1 100644
--- a/klee-miuicamera-vendor.mk
+++ b/klee-miuicamera-vendor.mk
@@ -91,9 +91,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/AIGesture/heart_5s.png:$(TARGET_COPY_OUT_ODM)/etc/camera/AIGesture/heart_5s.png \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/AIGesture/heart_6s.png:$(TARGET_COPY_OUT_ODM)/etc/camera/AIGesture/heart_6s.png \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/AIGesture/thumbup_3s.png:$(TARGET_COPY_OUT_ODM)/etc/camera/AIGesture/thumbup_3s.png \
-    vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/CFR_para_UW.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/CFR_para_UW.bin \
-    vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/no_uw.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/no_uw.bin \
-    vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/uw.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/uw.bin \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/videofilter/102_SummerDay.png:$(TARGET_COPY_OUT_ODM)/etc/camera/videofilter/102_SummerDay.png \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/videofilter/103_Fantasy.png:$(TARGET_COPY_OUT_ODM)/etc/camera/videofilter/103_Fantasy.png \
     vendor/xiaomi/klee-miuicamera/proprietary/odm/etc/camera/videofilter/104_Meet.png:$(TARGET_COPY_OUT_ODM)/etc/camera/videofilter/104_Meet.png \
@@ -283,8 +280,6 @@ PRODUCT_PACKAGES += \
     vendor.xiaomi.hardware.mtkblackbox-V3-ndk \
     libmisys_jni.xiaomi \
     libmqsas \
-    vendor.xiaomi.hardware.aidlbgservice-V1-ndk \
-    vendor.xiaomi.hardware.bgservice@1.0 \
     vendor.xiaomi.hardware.misys@1.0 \
     vendor.xiaomi.hardware.misys@3.0 \
     libcamera_algoup_jni.xiaomi \
@@ -294,6 +289,8 @@ PRODUCT_PACKAGES += \
     miui.mqsas.native-cpp \
     vendor.mediatek.hardware.camera.isphal-V1-ndk-system_ext \
     vendor.mediatek.hardware.camera.isphal@1.0-system_ext \
+    vendor.xiaomi.hardware.aidlbgservice-V1-ndk-system_ext \
+    vendor.xiaomi.hardware.bgservice@1.0-system_ext \
     vendor.xiaomi.hardware.misys.common-V3-ndk-system_ext \
     vendor.xiaomi.hardware.misys.core-V1-ndk-system_ext \
     MiuiCamera \
diff --git a/proprietary/odm/etc/camera/CFR_para_UW.bin b/proprietary/odm/etc/camera/CFR_para_UW.bin
deleted file mode 100644
index 95f5109..0000000
Binary files a/proprietary/odm/etc/camera/CFR_para_UW.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/no_uw.bin b/proprietary/odm/etc/camera/no_uw.bin
deleted file mode 100644
index b0be85e..0000000
Binary files a/proprietary/odm/etc/camera/no_uw.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/uw.bin b/proprietary/odm/etc/camera/uw.bin
deleted file mode 100644
index c162c21..0000000
Binary files a/proprietary/odm/etc/camera/uw.bin and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so b/proprietary/system_ext/lib/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so
deleted file mode 100644
index 20d3b98..0000000
Binary files a/proprietary/system_ext/lib/vendor.xiaomi.hardware.aidlbgservice-V1-ndk.so and /dev/null differ
diff --git a/proprietary/system_ext/lib/vendor.xiaomi.hardware.bgservice@1.0.so b/proprietary/system_ext/lib/vendor.xiaomi.hardware.bgservice@1.0.so
deleted file mode 100644
index c5b3b40..0000000
Binary files a/proprietary/system_ext/lib/vendor.xiaomi.hardware.bgservice@1.0.so and /dev/null differ