diff --git a/Android.bp b/Android.bp
index b66f2a9..c640501 100644
--- a/Android.bp
+++ b/Android.bp
@@ -471,37 +471,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "android.hardware.secure_element-impl-gto",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhardware",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libsec_semRil",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "android.hardware.gnss@2.1-impl",
     owner: "samsung",
@@ -3027,41 +2996,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "android.hardware.secure_element@1.2-service",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service",
-            ],
-            shared_libs: [
-                "android.hardware.secure_element@1.0",
-                "android.hardware.secure_element@1.1",
-                "android.hardware.secure_element@1.2",
-                "android.hardware.secure_element-impl-gto",
-                "libbase",
-                "libcutils",
-                "libhardware",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 sh_binary {
     name: "gps",
     owner: "samsung",
diff --git a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service b/proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service
deleted file mode 100755
index 7f4fc0c..0000000
Binary files a/proprietary/vendor/bin/hw/android.hardware.secure_element@1.2-service and /dev/null differ
diff --git a/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service.rc b/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service.rc
deleted file mode 100644
index 7879b64..0000000
--- a/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service vendor.secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element@1.2-service
-    class hal
-    user system
-    group system
diff --git a/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so b/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so
deleted file mode 100644
index f4a545f..0000000
Binary files a/proprietary/vendor/lib64/android.hardware.secure_element-impl-gto.so and /dev/null differ
diff --git a/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index dc85d5e..232940e 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -12,7 +12,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/init/android.hardware.keymaster@4.0_strongbox-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.0_strongbox-service.rc \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service.eden-drv.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service.eden-drv.rc \
-    vendor/samsung/universal9830-common/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service.rc \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/init/vendor.samsung_slsi.hardware.eden_runtime@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung_slsi.hardware.eden_runtime@1.0-service.rc \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/libse-gto-hal.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal.conf \
@@ -117,7 +116,6 @@ PRODUCT_PACKAGES += \
     libsecaudiocoreutils \
     libspatializerparamstorage \
     libwvhidl \
-    android.hardware.secure_element-impl-gto \
     android.hardware.gnss@2.1-impl \
     flp.default \
     gatekeeper.exynos990 \
@@ -208,7 +206,6 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.3-service.widevine \
     android.hardware.keymaster@4.0_strongbox-service \
     android.hardware.neuralnetworks@1.3-service.eden-drv \
-    android.hardware.secure_element@1.2-service \
     gps \
     lhd \
     rild \