diff --git a/Android.bp b/Android.bp
index cabf4e7..0b7443f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1461,25 +1461,10 @@ cc_prebuilt_library_shared {
             srcs: [
                 "proprietary/vendor/lib/hw/com.qti.chi.override.so",
             ],
-            shared_libs: [
-                "libc++",
-                "libcutils",
-                "liblog",
-                "libcamera_metadata",
-                "libhardware",
-                "libutils",
-                "libgrallocutils",
-                "libprotobuf-cpp-full-vendorcompat",
-                "libsensorslog",
-                "libssc",
-                "libsnsdiaglog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
         },
     },
     compile_multilib: "32",
+    check_elf_files: false,
     relative_install_path: "hw",
     prefer: true,
     soc_specific: true,
@@ -2088,22 +2073,10 @@ cc_prebuilt_library_shared {
             srcs: [
                 "proprietary/vendor/lib/libcsd-client.so",
             ],
-            shared_libs: [
-                "libutils",
-                "libqmi_cci",
-                "libqmi_common_so",
-                "libacdbloader",
-                "libcutils",
-                "libmdmdetect",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
         },
     },
     compile_multilib: "32",
+    check_elf_files: false,
     prefer: true,
     soc_specific: true,
 }
@@ -2446,42 +2419,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "android.hardware.bluetooth@1.0-impl-qti",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libutils",
-                "libdiag",
-                "libqmiservices",
-                "libqmi_cci",
-                "libbtnv",
-                "android.hardware.bluetooth@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "android.hardware.gnss@2.0-impl-qti",
     owner: "xiaomi",
@@ -2671,110 +2608,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.bluetooth_sar@1.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libhidltransport",
-                "libutils",
-                "liblog",
-                "libhwbinder",
-                "libbase",
-                "libcutils",
-                "libhardware",
-                "vendor.qti.hardware.bluetooth_sar@1.0",
-                "android.hardware.bluetooth@1.0",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.btconfigstore@1.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libhwbinder",
-                "libutils",
-                "vendor.qti.hardware.btconfigstore@1.0",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.fm@1.0-impl",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libhwbinder",
-                "libutils",
-                "vendor.qti.hardware.fm@1.0_vendor",
-                "android.hardware.bluetooth@1.0-impl-qti",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libaoa",
     owner: "xiaomi",
@@ -2829,30 +2662,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libbtnv",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libbtnv.so",
-            ],
-            shared_libs: [
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcacertclient",
     owner: "xiaomi",
@@ -3917,36 +3726,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.bluetooth_sar@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.cacert@1.0",
     owner: "xiaomi",
@@ -3977,39 +3756,8 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.fm@1.0_vendor",
-    stem: "vendor.qti.hardware.fm@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 prebuilt_rfsa {
-    name: "dirac_resource",
+    name: "vendor_lib_rfsa_adsp_dirac_resource_dar",
     filename: "dirac_resource.dar",
     owner: "xiaomi",
     src: "proprietary/vendor/lib/rfsa/adsp/dirac_resource.dar",
@@ -4017,97 +3765,6 @@ prebuilt_rfsa {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "fm_helium",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/fm_helium.so",
-            ],
-            shared_libs: [
-                "libfm-hci",
-                "liblog",
-                "libnativehelper",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libfm-hci",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/libfm-hci.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "liblog",
-                "libutils",
-                "android.hidl.base@1.0",
-                "vendor.qti.hardware.fm@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.fm@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "libhidltransport",
-                "libhwbinder",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
     name: "android.hardware.gnss@2.0-service-qti.xml",
     owner: "xiaomi",
@@ -4126,42 +3783,6 @@ prebuilt_etc_xml {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "android.hardware.bluetooth@1.0-service-qti",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libutils",
-                "libhwbinder",
-                "libhidlbase",
-                "libhidltransport",
-                "android.hardware.bluetooth@1.0",
-                "vendor.qti.hardware.fm@1.0_vendor",
-                "vendor.qti.hardware.bluetooth_sar@1.0",
-                "vendor.qti.hardware.btconfigstore@1.0",
-                "libqti_vndfwk_detect",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "android.hardware.gnss@2.0-service-qti",
     owner: "xiaomi",
diff --git a/beryllium-vendor.mk b/beryllium-vendor.mk
index 3342ea6..1f41f1c 100644
--- a/beryllium-vendor.mk
+++ b/beryllium-vendor.mk
@@ -39,7 +39,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/camera/score_icon.png:$(TARGET_COPY_OUT_VENDOR)/etc/camera/score_icon.png \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/camera/watermark_font_2300_3199.dat:$(TARGET_COPY_OUT_VENDOR)/etc/camera/watermark_font_2300_3199.dat \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/hdr_config.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/hdr_config.cfg \
-    vendor/xiaomi/beryllium/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/init/android.hardware.gnss@2.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss@2.0-service-qti.rc \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/init/android.hardware.keymaster@3.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@3.0-service-qti.rc \
     vendor/xiaomi/beryllium/proprietary/vendor/etc/qdcm_calib_data_ebbg_fhd_video_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_ebbg_fhd_video_dsi_panel.xml \
@@ -214,18 +213,13 @@ PRODUCT_PACKAGES += \
     libsymphonypower \
     libtonemapalgo \
     libvidhance \
-    android.hardware.bluetooth@1.0-impl-qti \
     android.hardware.gnss@2.0-impl-qti \
     android.hardware.keymaster@3.0-impl-qti \
     fingerprint.fpc.sdm845 \
     fingerprint.goodix.sdm845 \
     vendor.qti.gnss@3.0-impl \
-    vendor.qti.hardware.bluetooth_sar@1.0-impl \
-    vendor.qti.hardware.btconfigstore@1.0-impl \
-    vendor.qti.hardware.fm@1.0-impl \
     libaoa \
     libbatching \
-    libbtnv \
     libcacertclient \
     libdataitems \
     libgdtap \
@@ -261,16 +255,10 @@ PRODUCT_PACKAGES += \
     vendor.qti.gnss@2.1 \
     vendor.qti.gnss@3.0-service \
     vendor.qti.gnss@3.0 \
-    vendor.qti.hardware.bluetooth_sar@1.0 \
     vendor.qti.hardware.cacert@1.0 \
-    vendor.qti.hardware.fm@1.0_vendor \
-    dirac_resource \
-    fm_helium \
-    libfm-hci \
-    vendor.qti.hardware.fm@1.0 \
+    vendor_lib_rfsa_adsp_dirac_resource_dar \
     android.hardware.gnss@2.0-service-qti.xml \
     vendor.qti.gnss@3.0-service.xml \
-    android.hardware.bluetooth@1.0-service-qti \
     android.hardware.gnss@2.0-service-qti \
     android.hardware.keymaster@3.0-service-qti \
     loc_launcher \
diff --git a/proprietary/system_ext/lib64/fm_helium.so b/proprietary/system_ext/lib64/fm_helium.so
deleted file mode 100644
index 12fd592..0000000
Binary files a/proprietary/system_ext/lib64/fm_helium.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/libfm-hci.so b/proprietary/system_ext/lib64/libfm-hci.so
deleted file mode 100644
index 5dd95d8..0000000
Binary files a/proprietary/system_ext/lib64/libfm-hci.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so
deleted file mode 100644
index 33ef622..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.fm@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti b/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
deleted file mode 100755
index fb6f432..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti and /dev/null differ
diff --git a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
deleted file mode 100644
index 22b71f4..0000000
--- a/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service vendor.bluetooth-1-0-qti /vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
-    class hal
-    user bluetooth
-    group bluetooth system wakelock oem_2901
-    capabilities BLOCK_SUSPEND NET_ADMIN
diff --git a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so b/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
deleted file mode 100644
index 8d36b65..0000000
Binary files a/proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so
deleted file mode 100644
index 5f014ee..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.bluetooth_sar@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so
deleted file mode 100644
index 101655c..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so b/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so
deleted file mode 100644
index 5cb083c..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libbtnv.so b/proprietary/vendor/lib64/libbtnv.so
deleted file mode 100644
index 154948c..0000000
Binary files a/proprietary/vendor/lib64/libbtnv.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
deleted file mode 100644
index a19b64c..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so
deleted file mode 100644
index ceb0446..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.fm@1.0.so and /dev/null differ