diff --git a/Android.bp b/Android.bp
index ab22aa9..c935a4d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15516,211 +15516,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "com.qualcomm.qti.imscmservice@2.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.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: "com.qualcomm.qti.imscmservice@2.1",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so",
-            ],
-            shared_libs: [
-                "com.qualcomm.qti.imscmservice@2.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "com.qualcomm.qti.imscmservice@2.2",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so",
-            ],
-            shared_libs: [
-                "com.qualcomm.qti.imscmservice@2.0",
-                "com.qualcomm.qti.imscmservice@2.1",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "com.qualcomm.qti.uceservice@2.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.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: "com.qualcomm.qti.uceservice@2.1",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so",
-            ],
-            shared_libs: [
-                "com.qualcomm.qti.uceservice@2.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "com.qualcomm.qti.uceservice@2.2",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so",
-            ],
-            shared_libs: [
-                "com.qualcomm.qti.uceservice@2.0",
-                "com.qualcomm.qti.uceservice@2.1",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "com.qualcomm.qti.uceservice@2.3",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so",
-            ],
-            shared_libs: [
-                "com.qualcomm.qti.uceservice@2.0",
-                "com.qualcomm.qti.uceservice@2.1",
-                "com.qualcomm.qti.uceservice@2.2",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "fm_helium",
     owner: "xiaomi",
@@ -16883,156 +16678,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.radio.ims@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@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.qti.hardware.radio.ims@1.1",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.radio.ims@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.radio.ims@1.2",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.radio.ims@1.0",
-                "vendor.qti.hardware.radio.ims@1.1",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.radio.ims@1.3",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.radio.ims@1.0",
-                "vendor.qti.hardware.radio.ims@1.1",
-                "vendor.qti.hardware.radio.ims@1.2",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.hardware.radio.ims@1.4",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so",
-            ],
-            shared_libs: [
-                "vendor.qti.hardware.radio.ims@1.0",
-                "vendor.qti.hardware.radio.ims@1.1",
-                "vendor.qti.hardware.radio.ims@1.2",
-                "vendor.qti.hardware.radio.ims@1.3",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.qti.hardware.wifidisplaysession@1.0",
     owner: "xiaomi",
@@ -17061,120 +16706,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.qti.ims.callcapability@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.ims.callcapability@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.qti.ims.callinfo@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.ims.callinfo@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.qti.ims.factory@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so",
-            ],
-            shared_libs: [
-                "vendor.qti.ims.callcapability@1.0",
-                "vendor.qti.ims.rcsconfig@2.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    system_ext_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.qti.ims.rcsconfig@1.0",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@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.qti.imsrtpservice@3.0",
     owner: "xiaomi",
@@ -17293,17 +16824,6 @@ android_app_import {
     system_ext_specific: true,
 }
 
-android_app_import {
-    name: "uceShimService",
-    owner: "xiaomi",
-    apk: "proprietary/system_ext/app/uceShimService/uceShimService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    system_ext_specific: true,
-}
-
 android_app_import {
     name: "WfdService",
     owner: "xiaomi",
@@ -17378,33 +16898,6 @@ dex_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "com.qualcomm.qti.imscmservice-V2.0-java",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "com.qualcomm.qti.imscmservice-V2.1-java",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "com.qualcomm.qti.imscmservice-V2.2-java",
-    owner: "xiaomi",
-    jars: [
-        "proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar",
-    ],
-    system_ext_specific: true,
-}
-
 dex_import {
     name: "dpmapi",
     owner: "xiaomi",
diff --git a/proprietary/system_ext/app/uceShimService/uceShimService.apk b/proprietary/system_ext/app/uceShimService/uceShimService.apk
deleted file mode 100644
index 5f95a5b..0000000
Binary files a/proprietary/system_ext/app/uceShimService/uceShimService.apk and /dev/null differ
diff --git a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml b/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
deleted file mode 100644
index 1c3e49f..0000000
--- a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2017-2020 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
--->
-<permissions>
-    <library name="com.qualcomm.qti.imscmservice-V2.0-java"
-            file="/system/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar" />
-</permissions>
diff --git a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml b/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
deleted file mode 100644
index af152cd..0000000
--- a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2018-2020 Qualcomm Technologies, Inc.
-     All Rights Reserved.
-     Confidential and Proprietary - Qualcomm Technologies, Inc. -->
-
-<permissions>
-
-    <library name="com.qualcomm.qti.imscmservice-V2.1-java" file="/system/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar" />
-
-</permissions>
diff --git a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml b/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml
deleted file mode 100644
index 69bb86b..0000000
--- a/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-     All Rights Reserved.
-     Confidential and Proprietary - Qualcomm Technologies, Inc. -->
-
-<permissions>
-
-    <library name="com.qualcomm.qti.imscmservice-V2.2-java" file="/system/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar" />
-
-</permissions>
diff --git a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar b/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar
deleted file mode 100644
index b89beb5..0000000
Binary files a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar and /dev/null differ
diff --git a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar b/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar
deleted file mode 100644
index ddfca8c..0000000
Binary files a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar and /dev/null differ
diff --git a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar b/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar
deleted file mode 100644
index 21a20d0..0000000
Binary files a/proprietary/system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so
deleted file mode 100644
index 8c79091..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so b/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so
deleted file mode 100644
index 41d47bb..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.1.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so b/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so
deleted file mode 100644
index d37f61a..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.imscmservice@2.2.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so b/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so
deleted file mode 100644
index 8d95c7e..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so b/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so
deleted file mode 100644
index 128f460..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.1.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so b/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so
deleted file mode 100644
index 6c687d1..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.2.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so b/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so
deleted file mode 100644
index d5bb634..0000000
Binary files a/proprietary/system_ext/lib64/com.qualcomm.qti.uceservice@2.3.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so
deleted file mode 100644
index 77a9e8f..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so b/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so
deleted file mode 100644
index 2e12994..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.1.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so b/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so
deleted file mode 100644
index af905d6..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.2.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so b/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so
deleted file mode 100644
index 720a44c..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.3.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so b/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so
deleted file mode 100644
index a49f326..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.hardware.radio.ims@1.4.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so b/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so
deleted file mode 100644
index a3829fd..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.ims.callcapability@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so b/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so
deleted file mode 100644
index b14bb75..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.ims.callinfo@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so b/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so
deleted file mode 100644
index e23e085..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.ims.factory@1.0.so and /dev/null differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so b/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so
deleted file mode 100644
index ba9c67f..0000000
Binary files a/proprietary/system_ext/lib64/vendor.qti.ims.rcsconfig@1.0.so and /dev/null differ
diff --git a/sm6250-common-vendor.mk b/sm6250-common-vendor.mk
index 86d53dd..3660b12 100644
--- a/sm6250-common-vendor.mk
+++ b/sm6250-common-vendor.mk
@@ -14,9 +14,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
-    vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml \
-    vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml \
-    vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/xiaomi/sm6250-common/proprietary/system_ext/etc/permissions/qti_libpermissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_libpermissions.xml \
@@ -839,13 +836,6 @@ PRODUCT_PACKAGES += \
     misound_res \
     tas25xx_TI_0 \
     com.qualcomm.qti.dpm.api@1.0 \
-    com.qualcomm.qti.imscmservice@2.0 \
-    com.qualcomm.qti.imscmservice@2.1 \
-    com.qualcomm.qti.imscmservice@2.2 \
-    com.qualcomm.qti.uceservice@2.0 \
-    com.qualcomm.qti.uceservice@2.1 \
-    com.qualcomm.qti.uceservice@2.2 \
-    com.qualcomm.qti.uceservice@2.3 \
     fm_helium \
     lib-imsvideocodec \
     lib-imsvt \
@@ -882,16 +872,7 @@ PRODUCT_PACKAGES += \
     libwfduibcsrcinterface \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.fm@1.0 \
-    vendor.qti.hardware.radio.ims@1.0 \
-    vendor.qti.hardware.radio.ims@1.1 \
-    vendor.qti.hardware.radio.ims@1.2 \
-    vendor.qti.hardware.radio.ims@1.3 \
-    vendor.qti.hardware.radio.ims@1.4 \
     vendor.qti.hardware.wifidisplaysession@1.0 \
-    vendor.qti.ims.callcapability@1.0 \
-    vendor.qti.ims.callinfo@1.0 \
-    vendor.qti.ims.factory@1.0 \
-    vendor.qti.ims.rcsconfig@1.0 \
     vendor.qti.imsrtpservice@3.0 \
     CACertService \
     CneApp \
@@ -901,7 +882,6 @@ PRODUCT_PACKAGES += \
     HotwordEnrollmentXGoogleHEXAGON \
     DeviceInfo \
     QtiTelephonyService \
-    uceShimService \
     WfdService \
     dpmserviceapp \
     ims \
@@ -909,9 +889,6 @@ PRODUCT_PACKAGES += \
     WfdCommon \
     com.android.hotwordenrollment.common.util \
     com.qti.dpmframework \
-    com.qualcomm.qti.imscmservice-V2.0-java \
-    com.qualcomm.qti.imscmservice-V2.1-java \
-    com.qualcomm.qti.imscmservice-V2.2-java \
     dpmapi \
     qcrilhook \
     android.hardware.neuralnetworks@1.3-service-qti-hta.xml \