diff --git a/Android.bp b/Android.bp
index 88b6cd0..f964503 100644
--- a/Android.bp
+++ b/Android.bp
@@ -405,31 +405,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libstork_shared",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libstork_shared.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libswlme",
     owner: "samsung",
@@ -458,71 +433,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libvkservice",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libvkservice.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libstork_shared",
-                "libteecl",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.security.vaultkeeper@2.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper@2.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-prebuilt_etc_xml {
-    name: "vaultkeeper_manifest.xml",
-    owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vaultkeeper_manifest.xml",
-    filename_from_src: true,
-    sub_dir: "vintf/manifest",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "android.hardware.security.keymint-service.samsung",
     owner: "samsung",
@@ -563,62 +473,3 @@ cc_prebuilt_binary {
     relative_install_path: "hw",
     soc_specific: true,
 }
-
-cc_prebuilt_binary {
-    name: "vaultkeeperd",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/vaultkeeperd",
-            ],
-            shared_libs: [
-                "libdsms_vendor",
-                "libvkservice",
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_binary {
-    name: "vendor.samsung.hardware.security.vaultkeeper@2.0-service",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service",
-            ],
-            shared_libs: [
-                "liblog",
-                "libbase",
-                "libutils",
-                "libhardware",
-                "libhidlbase",
-                "vendor.samsung.hardware.security.vaultkeeper@2.0",
-                "libvkmanager_vendor",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
diff --git a/m34x-vendor.mk b/m34x-vendor.mk
index 19d3d11..b38f97f 100644
--- a/m34x-vendor.mk
+++ b/m34x-vendor.mk
@@ -230,11 +230,5 @@ PRODUCT_PACKAGES += \
     libsec2lsi_conversion \
     libskeymint10device \
     libskeymint_cli \
-    libstork_shared \
     libswlme \
-    libvkservice \
-    vendor.samsung.hardware.security.vaultkeeper@2.0 \
-    vaultkeeper_manifest.xml \
-    android.hardware.security.keymint-service.samsung \
-    vaultkeeperd \
-    vendor.samsung.hardware.security.vaultkeeper@2.0-service
+    android.hardware.security.keymint-service.samsung
diff --git a/proprietary/vendor/bin/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd
deleted file mode 100755
index db2efcb..0000000
Binary files a/proprietary/vendor/bin/vaultkeeperd and /dev/null differ
diff --git a/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service b/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service
deleted file mode 100755
index aa672e2..0000000
Binary files a/proprietary/vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service and /dev/null differ
diff --git a/proprietary/vendor/etc/vintf/manifest/vaultkeeper_manifest.xml b/proprietary/vendor/etc/vintf/manifest/vaultkeeper_manifest.xml
deleted file mode 100644
index 16bedf7..0000000
--- a/proprietary/vendor/etc/vintf/manifest/vaultkeeper_manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>vendor.samsung.hardware.security.vaultkeeper</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ISehVaultKeeper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/proprietary/vendor/lib64/libstork_shared.so b/proprietary/vendor/lib64/libstork_shared.so
deleted file mode 100644
index 5c72215..0000000
Binary files a/proprietary/vendor/lib64/libstork_shared.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so
deleted file mode 100644
index 08a827e..0000000
Binary files a/proprietary/vendor/lib64/libvkservice.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper@2.0.so
deleted file mode 100644
index 824e814..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.security.vaultkeeper@2.0.so and /dev/null differ