diff --git a/Android.bp b/Android.bp
index 168aeee..ee60119 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2466,23 +2466,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "libembmsservice",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/libembmsservice.so"],
-			shared_libs: ["liblog", "libqmi_cci", "libqmi", "libqmi_client_helper", "libqmiservices", "libidl", "libdsutils", "libtime_genoff", "libdiag", "libdsi_netctrl", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "libeva",
 	owner: "xiaomi",
@@ -7901,40 +7884,6 @@ cc_prebuilt_library_shared {
 	soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.embmssl@1.0",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.0.so"],
-			shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
-	soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-	name: "vendor.qti.hardware.embmssl@1.1",
-	owner: "xiaomi",
-	strip: {
-		none: true,
-	},
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.1.so"],
-			shared_libs: ["vendor.qti.hardware.embmssl@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
 	name: "vendor.qti.hardware.fm@1.0",
 	owner: "xiaomi",
@@ -10998,23 +10947,6 @@ cc_prebuilt_binary {
 	soc_specific: true,
 }
 
-cc_prebuilt_binary {
-	name: "embmsslServer",
-	owner: "xiaomi",
-	target: {
-		android_arm64: {
-			srcs: ["proprietary/vendor/bin/embmsslServer"],
-			shared_libs: ["libembmsservice", "liblog", "libutils", "libhidlbase", "vendor.qti.hardware.embmssl@1.0", "vendor.qti.hardware.embmssl@1.1", "libqmiservices", "libqmi_cci", "libqmi_encdec", "libc++", "libc", "libm", "libdl", ],
-		},
-	},
-	compile_multilib: "64",
-	strip: {
-		none: true,
-	},
-	prefer: true,
-	soc_specific: true,
-}
-
 cc_prebuilt_binary {
 	name: "android.hardware.bluetooth@1.0-service-qti",
 	owner: "xiaomi",
diff --git a/proprietary/vendor/bin/embmsslServer b/proprietary/vendor/bin/embmsslServer
deleted file mode 100755
index 3bce613..0000000
Binary files a/proprietary/vendor/bin/embmsslServer and /dev/null differ
diff --git a/proprietary/vendor/etc/init/init.embmssl_server.rc b/proprietary/vendor/etc/init/init.embmssl_server.rc
deleted file mode 100644
index 071c38c..0000000
--- a/proprietary/vendor/etc/init/init.embmssl_server.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2019-2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc.
-#
-
-service vendor.embmsslServer /vendor/bin/embmsslServer
-    class main
-    user radio
-    group radio oem_2901
-
-
-    # don't auto restart
-    oneshot
-
-    # start only when requested
-    disabled
diff --git a/proprietary/vendor/lib64/libembmsservice.so b/proprietary/vendor/lib64/libembmsservice.so
deleted file mode 100644
index 7cc87a1..0000000
Binary files a/proprietary/vendor/lib64/libembmsservice.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.0.so
deleted file mode 100644
index 7369717..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.1.so b/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.1.so
deleted file mode 100644
index 7796df6..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.embmssl@1.1.so and /dev/null differ
diff --git a/sm8450-common-vendor.mk b/sm8450-common-vendor.mk
index 7208798..a913922 100644
--- a/sm8450-common-vendor.mk
+++ b/sm8450-common-vendor.mk
@@ -93,7 +93,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/hw/init.mi_thermald.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.mi_thermald.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/ims_rtp_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ims_rtp_daemon.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/imsdaemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/imsdaemon.rc \
-    vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/init.embmssl_server.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.embmssl_server.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/init.qdmastats.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qdmastats.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/init.qti.fm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.fm.rc \
     vendor/xiaomi/sm8450-common/proprietary/vendor/etc/init/init.qti.qcv.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.qcv.rc \
@@ -400,7 +399,6 @@ PRODUCT_PACKAGES += \
     libdsd2pcm \
     libdsi_netctrl \
     libdsutils \
-    libembmsservice \
     libeva \
     libeva_util \
     libface3d_dev \
@@ -719,8 +717,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.dpmservice@1.0-vendor \
     vendor.qti.hardware.dpmservice@1.1-vendor \
     vendor.qti.hardware.dsp@1.0 \
-    vendor.qti.hardware.embmssl@1.0 \
-    vendor.qti.hardware.embmssl@1.1 \
     vendor.qti.hardware.fm@1.0 \
     vendor.qti.hardware.iop@1.0 \
     vendor.qti.hardware.iop@2.0 \
@@ -927,7 +923,6 @@ PRODUCT_PACKAGES += \
     dpmQmiMgr \
     dspservice \
     edgnss-daemon \
-    embmsslServer \
     android.hardware.bluetooth@1.0-service-qti \
     android.hardware.drm@1.4-service.widevine \
     android.hardware.gatekeeper@1.0-service-qti \