diff --git a/Android.bp b/Android.bp
index 3847a4c..2db00da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5157,23 +5157,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libqtiidentitycredential",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libqtiidentitycredential.so"],
-			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libqcbor", "libhardware", "libkeymasterdeviceutils", "libkeymasterutils", "libhidlbase", "libcrypto", "libQSEEComAPI", "libbinder_ndk", "android.hardware.identity-V3-ndk_platform", "android.hardware.keymaster-V3-ndk_platform", "libkeymasterprovision", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libqtikeymaster4",
 	owner: "xiaomi",
@@ -10782,15 +10765,6 @@ prebuilt_etc_xml {
 	soc_specific: true,
 }
 
-prebuilt_etc_xml {
-	name: "manifest_lahaina_identity",
-	owner: "xiaomi",
-	src: "proprietary/vendor/etc/vintf/manifest/manifest_lahaina_identity.xml",
-	filename_from_src: true,
-	sub_dir: "vintf/manifest",
-	soc_specific: true,
-}
-
 prebuilt_etc_xml {
 	name: "manifest_vendor.xiaomi.hardware.mlipay",
 	owner: "xiaomi",
@@ -11130,24 +11104,6 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
-cc_prebuilt_binary {
-	name: "android.hardware.identity-service-qti",
-	owner: "xiaomi",
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/bin/hw/android.hardware.identity-service-qti"],
-			shared_libs: ["liblog", "libcutils", "libbase", "libutils", "libhardware", "libqcbor", "libkeymasterdeviceutils", "libkeymasterutils", "libhidlbase", "libcrypto", "libQSEEComAPI", "libbinder_ndk", "libqtiidentitycredential", "android.hardware.identity-V3-ndk_platform", "android.hardware.keymaster-V3-ndk_platform", "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.keymaster@4.1-service-qti",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/bin/hw/android.hardware.identity-service-qti b/proprietary/vendor/bin/hw/android.hardware.identity-service-qti
deleted file mode 100755
index ea715de..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.identity-service-qti and /dev/null differ
diff --git a/proprietary/vendor/etc/init/android.hardware.identity-service-qti.rc b/proprietary/vendor/etc/init/android.hardware.identity-service-qti.rc
deleted file mode 100644
index 1cbfa7e..0000000
--- a/proprietary/vendor/etc/init/android.hardware.identity-service-qti.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service vendor.identity /vendor/bin/hw/android.hardware.identity-service-qti
-    class hal
-    user system
-    group system
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_lahaina_identity.xml b/proprietary/vendor/etc/vintf/manifest/manifest_lahaina_identity.xml
deleted file mode 100644
index 0f58938..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_lahaina_identity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-/*
- * Copyright (c) 2021 Qualcomm Technologies, Inc.
- * All Rights Reserved.
- * Confidential and Proprietary - Qualcomm Technologies, Inc.
- -->
- 
-<manifest version="1.0" type="device">
-    <hal format="aidl">
-        <name>android.hardware.identity</name>
-        <version>3</version>
-        <interface>
-            <name>IIdentityCredentialStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/lib64/libqtiidentitycredential.so b/proprietary/vendor/lib64/libqtiidentitycredential.so
deleted file mode 100644
index 34d1734..0000000
Binary files a/proprietary/vendor/lib64/libqtiidentitycredential.so and /dev/null differ
diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk
index cb629cc..5f3e89b 100644
--- a/sm8450-common-vendor.mk
+++ b/sm8450-common-vendor.mk
@@ -83,7 +83,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
-    vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.identity-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.identity-service-qti.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/android.hardware.security.keymint-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service-qti.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
@@ -560,7 +559,6 @@ PRODUCT_PACKAGES += \
     libqti-util \
     libqti-utils \
     libqtigefar \
-    libqtiidentitycredential \
     libqtikeymaster4 \
     libqtikeymint \
     librcc \
@@ -912,7 +910,6 @@ PRODUCT_PACKAGES += \
     c2_manifest_vendor_audio \
     dataconnection-saidl \
     manifest_android.hardware.drm@1.4-service.widevine \
-    manifest_lahaina_identity \
     manifest_vendor.xiaomi.hardware.mlipay \
     qtiradio-saidl \
     vendor.qti.diag.hal.service \
@@ -937,7 +934,6 @@ PRODUCT_PACKAGES += \
     android.hardware.bluetooth@1.0-service-qti \
     android.hardware.drm@1.4-service.widevine \
     android.hardware.gatekeeper@1.0-service-qti \
-    android.hardware.identity-service-qti \
     android.hardware.keymaster@4.1-service-qti \
     android.hardware.security.keymint-service-qti \
     qconfigservice \