diff --git a/Android.bp b/Android.bp
index d5ea6f2..e51c7ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -424,77 +424,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libcommon",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcommon.so",
-            ],
-            shared_libs: [
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libcommon_graphgen_export",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcommon_graphgen_export.so",
-            ],
-            shared_libs: [
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libcrane_compiler",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libcrane_compiler.so",
-            ],
-            shared_libs: [
-                "libir",
-                "libcommon",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libcrypto-tm",
     owner: "samsung",
@@ -518,31 +447,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libdove_compiler",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libdove_compiler.so",
-            ],
-            shared_libs: [
-                "libir",
-                "libcommon",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libdpuhdr10p_8825",
     owner: "samsung",
@@ -568,289 +472,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libeden_model",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_model.so",
-            ],
-            shared_libs: [
-                "libeden_xtool",
-                "libeden_profiler",
-                "libeden_osal",
-                "libcutils",
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_nn",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_nn.so",
-            ],
-            shared_libs: [
-                "libeden_rt",
-                "liblog",
-                "libeden_profiler",
-                "libcutils",
-                "libeden_osal",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_osal",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_osal.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_profiler",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_profiler.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libeden_osal",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_rt",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_rt.so",
-            ],
-            shared_libs: [
-                "libeden_ud_npu",
-                "libeden_ud_cpu",
-                "libeden_ud_gpu",
-                "libeden_ud_dsp",
-                "libutils",
-                "libeden_model",
-                "libeden_profiler",
-                "libeden_osal",
-                "libcutils",
-                "liblog",
-                "libenn_dsp_dal",
-                "libenn_dsp_kernels_cpu",
-                "libenn_dsp_fw_graph_parser",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_ud_cpu",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_ud_cpu.so",
-            ],
-            shared_libs: [
-                "libeden_model",
-                "libeden_profiler",
-                "libeden_osal",
-                "liblog",
-                "libcutils",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_ud_dsp",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_ud_dsp.so",
-            ],
-            shared_libs: [
-                "libeden_model",
-                "libeden_profiler",
-                "libenn_dsp_dal",
-                "libenn_dsp_kernels_cpu",
-                "libenn_dsp_fw_graph_parser",
-                "libcutils",
-                "libeden_osal",
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_ud_gpu",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_ud_gpu.so",
-            ],
-            shared_libs: [
-                "libeden_ud_cpu",
-                "libGLES_mali",
-                "libeden_model",
-                "libeden_profiler",
-                "libcutils",
-                "libeden_osal",
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_ud_npu",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_ud_npu.so",
-            ],
-            shared_libs: [
-                "libeden_model",
-                "libeden_profiler",
-                "libeden_osal",
-                "liblog",
-                "libcutils",
-                "libutils",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libeden_xtool",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libeden_xtool.so",
-            ],
-            shared_libs: [
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libegis_fp_normal_sensor_test",
     owner: "samsung",
@@ -902,78 +523,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libenn_dsp_dal",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libenn_dsp_dal.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libenn_dsp_fw_graph_parser",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libenn_dsp_fw_graph_parser.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libenn_dsp_kernels_cpu",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libenn_dsp_kernels_cpu.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libexynoscamera_cnr_plugin",
     owner: "samsung",
@@ -1081,314 +630,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libgraphgen_ann_import",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_ann_import.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidlmemory",
-                "liblog",
-                "libutils",
-                "libnativewindow",
-                "android.hardware.neuralnetworks@1.0",
-                "android.hardware.neuralnetworks@1.1",
-                "android.hardware.neuralnetworks@1.2",
-                "android.hardware.neuralnetworks@1.3",
-                "android.hidl.memory@1.0",
-                "libgraphgen_network",
-                "libgraphgen_misc",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_ann_import_s",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_ann_import_s.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidlmemory",
-                "liblog",
-                "libutils",
-                "libnativewindow",
-                "android.hardware.neuralnetworks@1.0",
-                "android.hardware.neuralnetworks@1.1",
-                "android.hardware.neuralnetworks@1.2",
-                "android.hardware.neuralnetworks@1.3",
-                "android.hidl.memory@1.0",
-                "libgraphgen_network",
-                "libgraphgen_misc",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_ann_nnc",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_ann_nnc.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidlmemory",
-                "liblog",
-                "libutils",
-                "libnativewindow",
-                "android.hardware.neuralnetworks@1.0",
-                "android.hardware.neuralnetworks@1.1",
-                "android.hardware.neuralnetworks@1.2",
-                "android.hardware.neuralnetworks@1.3",
-                "android.hidl.memory@1.0",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_api",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_api.so",
-            ],
-            shared_libs: [
-                "libgraphgen_ann_nnc",
-                "libgraphgen_import",
-                "libgraphgen_ann_import",
-                "libgraphgen_ann_import_s",
-                "libgraphgen_export",
-                "libtoco_graphgen_export",
-                "libcommon_graphgen_export",
-                "libgraphgen_intermediate_process",
-                "libgraphgen_network",
-                "libnpu_compiler",
-                "libcommon",
-                "libcrane_compiler",
-                "libdove_compiler",
-                "libir",
-                "libsait_npu_compiler",
-                "libgraphgen_misc",
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidlmemory",
-                "liblog",
-                "libutils",
-                "libnativewindow",
-                "android.hardware.neuralnetworks@1.0",
-                "android.hardware.neuralnetworks@1.1",
-                "android.hardware.neuralnetworks@1.2",
-                "android.hardware.neuralnetworks@1.3",
-                "android.hidl.memory@1.0",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_export",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_export.so",
-            ],
-            shared_libs: [
-                "libgraphgen_network",
-                "libgraphgen_misc",
-                "libtoco_graphgen_export",
-                "libcommon_graphgen_export",
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_import",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_import.so",
-            ],
-            shared_libs: [
-                "libgraphgen_ann_import",
-                "libgraphgen_ann_import_s",
-                "libgraphgen_network",
-                "libgraphgen_misc",
-                "libcutils",
-                "libbase",
-                "libhidlbase",
-                "libhidlmemory",
-                "liblog",
-                "libutils",
-                "libnativewindow",
-                "android.hardware.neuralnetworks@1.0",
-                "android.hardware.neuralnetworks@1.1",
-                "android.hardware.neuralnetworks@1.2",
-                "android.hardware.neuralnetworks@1.3",
-                "android.hidl.memory@1.0",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_intermediate_process",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_intermediate_process.so",
-            ],
-            shared_libs: [
-                "libgraphgen_network",
-                "libnpu_compiler",
-                "libcommon",
-                "libcrane_compiler",
-                "libdove_compiler",
-                "libir",
-                "libsait_npu_compiler",
-                "libgraphgen_misc",
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_misc",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_misc.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libgraphgen_network",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libgraphgen_network.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libgraphgen_misc",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libhdr10p_meta_plugin_default",
     owner: "samsung",
@@ -1471,271 +712,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libir",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libir.so",
-            ],
-            shared_libs: [
-                "libcommon",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpu_compiler",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpu_compiler.so",
-            ],
-            shared_libs: [
-                "libsait_npu_compiler",
-                "libcrane_compiler",
-                "libdove_compiler",
-                "libir",
-                "libcommon",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_api",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_api.so",
-            ],
-            shared_libs: [
-                "libnpuc_controller",
-                "libnpuc_frontend",
-                "libnpuc_template",
-                "libnpuc_graph",
-                "libnpuc_backend",
-                "libnpuc_cmdq",
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_backend",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_backend.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libnpuc_cmdq",
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_cmdq",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_cmdq.so",
-            ],
-            shared_libs: [
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_common",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_common.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_controller",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_controller.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libnpuc_frontend",
-                "libnpuc_backend",
-                "libnpuc_template",
-                "libnpuc_cmdq",
-                "libnpuc_graph",
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_frontend",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_frontend.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libnpuc_template",
-                "libnpuc_cmdq",
-                "libnpuc_graph",
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_graph",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_graph.so",
-            ],
-            shared_libs: [
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libnpuc_template",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libnpuc_template.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libnpuc_cmdq",
-                "libnpuc_graph",
-                "libnpuc_common",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "liboemcrypto",
     owner: "samsung",
@@ -1890,31 +866,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libsait_npu_compiler",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libsait_npu_compiler.so",
-            ],
-            shared_libs: [
-                "libir",
-                "libcommon",
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libsec-ril",
     owner: "samsung",
@@ -2312,29 +1263,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libtoco_graphgen_export",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libtoco_graphgen_export.so",
-            ],
-            shared_libs: [
-                "libm",
-                "libdl",
-                "libc",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libuniapi",
     owner: "samsung",
@@ -2437,35 +1365,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libvpl",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libvpl.so",
-            ],
-            shared_libs: [
-                "libeden_nn",
-                "libutils",
-                "libcutils",
-                "liblog",
-                "libz",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libwrappergps",
     owner: "samsung",
diff --git a/proprietary/vendor/etc/eden/gpu/eden_kernel_64.bin b/proprietary/vendor/etc/eden/gpu/eden_kernel_64.bin
deleted file mode 100644
index 672ae59..0000000
Binary files a/proprietary/vendor/etc/eden/gpu/eden_kernel_64.bin and /dev/null differ
diff --git a/proprietary/vendor/lib64/libcommon.so b/proprietary/vendor/lib64/libcommon.so
deleted file mode 100644
index 3de3090..0000000
Binary files a/proprietary/vendor/lib64/libcommon.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libcommon_graphgen_export.so b/proprietary/vendor/lib64/libcommon_graphgen_export.so
deleted file mode 100644
index 72ac6e7..0000000
Binary files a/proprietary/vendor/lib64/libcommon_graphgen_export.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libcrane_compiler.so b/proprietary/vendor/lib64/libcrane_compiler.so
deleted file mode 100644
index 8d63534..0000000
Binary files a/proprietary/vendor/lib64/libcrane_compiler.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdove_compiler.so b/proprietary/vendor/lib64/libdove_compiler.so
deleted file mode 100644
index 1d5e216..0000000
Binary files a/proprietary/vendor/lib64/libdove_compiler.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_model.so b/proprietary/vendor/lib64/libeden_model.so
deleted file mode 100644
index ad2d1eb..0000000
Binary files a/proprietary/vendor/lib64/libeden_model.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_nn.so b/proprietary/vendor/lib64/libeden_nn.so
deleted file mode 100644
index 5791523..0000000
Binary files a/proprietary/vendor/lib64/libeden_nn.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_osal.so b/proprietary/vendor/lib64/libeden_osal.so
deleted file mode 100644
index c960511..0000000
Binary files a/proprietary/vendor/lib64/libeden_osal.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_profiler.so b/proprietary/vendor/lib64/libeden_profiler.so
deleted file mode 100644
index 8d58075..0000000
Binary files a/proprietary/vendor/lib64/libeden_profiler.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_rt.so b/proprietary/vendor/lib64/libeden_rt.so
deleted file mode 100644
index 1a52966..0000000
Binary files a/proprietary/vendor/lib64/libeden_rt.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_ud_cpu.so b/proprietary/vendor/lib64/libeden_ud_cpu.so
deleted file mode 100644
index f37750e..0000000
Binary files a/proprietary/vendor/lib64/libeden_ud_cpu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_ud_dsp.so b/proprietary/vendor/lib64/libeden_ud_dsp.so
deleted file mode 100644
index d44f207..0000000
Binary files a/proprietary/vendor/lib64/libeden_ud_dsp.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_ud_gpu.so b/proprietary/vendor/lib64/libeden_ud_gpu.so
deleted file mode 100644
index ba6acbb..0000000
Binary files a/proprietary/vendor/lib64/libeden_ud_gpu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_ud_npu.so b/proprietary/vendor/lib64/libeden_ud_npu.so
deleted file mode 100644
index ebd27ef..0000000
Binary files a/proprietary/vendor/lib64/libeden_ud_npu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libeden_xtool.so b/proprietary/vendor/lib64/libeden_xtool.so
deleted file mode 100644
index c20980c..0000000
Binary files a/proprietary/vendor/lib64/libeden_xtool.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libenn_dsp_dal.so b/proprietary/vendor/lib64/libenn_dsp_dal.so
deleted file mode 100644
index 6370169..0000000
Binary files a/proprietary/vendor/lib64/libenn_dsp_dal.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libenn_dsp_fw_graph_parser.so b/proprietary/vendor/lib64/libenn_dsp_fw_graph_parser.so
deleted file mode 100644
index ee76f5f..0000000
Binary files a/proprietary/vendor/lib64/libenn_dsp_fw_graph_parser.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libenn_dsp_kernels_cpu.so b/proprietary/vendor/lib64/libenn_dsp_kernels_cpu.so
deleted file mode 100644
index 50e4b24..0000000
Binary files a/proprietary/vendor/lib64/libenn_dsp_kernels_cpu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_ann_import.so b/proprietary/vendor/lib64/libgraphgen_ann_import.so
deleted file mode 100644
index ec77578..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_ann_import.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_ann_import_s.so b/proprietary/vendor/lib64/libgraphgen_ann_import_s.so
deleted file mode 100644
index 0406b87..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_ann_import_s.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_ann_nnc.so b/proprietary/vendor/lib64/libgraphgen_ann_nnc.so
deleted file mode 100644
index d77a0cc..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_ann_nnc.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_api.so b/proprietary/vendor/lib64/libgraphgen_api.so
deleted file mode 100644
index deb81ca..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_api.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_export.so b/proprietary/vendor/lib64/libgraphgen_export.so
deleted file mode 100644
index cc407a6..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_export.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_import.so b/proprietary/vendor/lib64/libgraphgen_import.so
deleted file mode 100644
index cebbb68..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_import.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_intermediate_process.so b/proprietary/vendor/lib64/libgraphgen_intermediate_process.so
deleted file mode 100644
index 0fb403e..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_intermediate_process.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_misc.so b/proprietary/vendor/lib64/libgraphgen_misc.so
deleted file mode 100644
index 8742fa0..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_misc.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libgraphgen_network.so b/proprietary/vendor/lib64/libgraphgen_network.so
deleted file mode 100644
index d03b0e6..0000000
Binary files a/proprietary/vendor/lib64/libgraphgen_network.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libir.so b/proprietary/vendor/lib64/libir.so
deleted file mode 100644
index a6d82e0..0000000
Binary files a/proprietary/vendor/lib64/libir.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpu_compiler.so b/proprietary/vendor/lib64/libnpu_compiler.so
deleted file mode 100644
index ee72a67..0000000
Binary files a/proprietary/vendor/lib64/libnpu_compiler.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_api.so b/proprietary/vendor/lib64/libnpuc_api.so
deleted file mode 100644
index 0a9470b..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_api.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_backend.so b/proprietary/vendor/lib64/libnpuc_backend.so
deleted file mode 100644
index ad6afd6..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_backend.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_cmdq.so b/proprietary/vendor/lib64/libnpuc_cmdq.so
deleted file mode 100644
index fec2330..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_cmdq.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_common.so b/proprietary/vendor/lib64/libnpuc_common.so
deleted file mode 100644
index 63cc69d..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_common.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_controller.so b/proprietary/vendor/lib64/libnpuc_controller.so
deleted file mode 100644
index 3f2068a..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_controller.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_frontend.so b/proprietary/vendor/lib64/libnpuc_frontend.so
deleted file mode 100644
index bb7691b..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_frontend.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_graph.so b/proprietary/vendor/lib64/libnpuc_graph.so
deleted file mode 100644
index 22b6a5c..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_graph.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libnpuc_template.so b/proprietary/vendor/lib64/libnpuc_template.so
deleted file mode 100644
index d0ef289..0000000
Binary files a/proprietary/vendor/lib64/libnpuc_template.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsait_npu_compiler.so b/proprietary/vendor/lib64/libsait_npu_compiler.so
deleted file mode 100644
index 8b1e45a..0000000
Binary files a/proprietary/vendor/lib64/libsait_npu_compiler.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libtoco_graphgen_export.so b/proprietary/vendor/lib64/libtoco_graphgen_export.so
deleted file mode 100644
index 8d75e1c..0000000
Binary files a/proprietary/vendor/lib64/libtoco_graphgen_export.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libvpl.so b/proprietary/vendor/lib64/libvpl.so
deleted file mode 100644
index 77fcf97..0000000
Binary files a/proprietary/vendor/lib64/libvpl.so and /dev/null differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 8d2d640..3357970 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -18,7 +18,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/calib_data_rgbgain.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/calib_data_rgbgain.xml \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/calib_data_skincolor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/calib_data_skincolor.xml \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/calib_data_whitepoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/calib_data_whitepoint.xml \
-    vendor/samsung/s5e8825-common/proprietary/vendor/etc/eden/gpu/eden_kernel_64.bin:$(TARGET_COPY_OUT_VENDOR)/etc/eden/gpu/eden_kernel_64.bin \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/ca.pem:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/ca.pem \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm-service.widevine.rc \
@@ -71,59 +70,22 @@ PRODUCT_PACKAGES += \
     lib_SoundAlive_SRC384_ver320 \
     lib_soundaliveresampler \
     libc++_shared \
-    libcommon \
-    libcommon_graphgen_export \
-    libcrane_compiler \
     libcrypto-tm \
-    libdove_compiler \
     libdpuhdr10p_8825 \
-    libeden_model \
-    libeden_nn \
-    libeden_osal \
-    libeden_profiler \
-    libeden_rt \
-    libeden_ud_cpu \
-    libeden_ud_dsp \
-    libeden_ud_gpu \
-    libeden_ud_npu \
-    libeden_xtool \
     libegis_fp_normal_sensor_test \
     libengmode_client \
-    libenn_dsp_dal \
-    libenn_dsp_fw_graph_parser \
-    libenn_dsp_kernels_cpu \
     libexynoscamera_cnr_plugin \
     libexynoscamera_plugin \
     libfloatingfeature \
     libgf_in_system_lib \
-    libgraphgen_ann_import \
-    libgraphgen_ann_import_s \
-    libgraphgen_ann_nnc \
-    libgraphgen_api \
-    libgraphgen_export \
-    libgraphgen_import \
-    libgraphgen_intermediate_process \
-    libgraphgen_misc \
-    libgraphgen_network \
     libhdr10p_meta_plugin_default \
     libhdr_plugin_exynos8825 \
     libhwjsqz \
-    libir \
-    libnpu_compiler \
-    libnpuc_api \
-    libnpuc_backend \
-    libnpuc_cmdq \
-    libnpuc_common \
-    libnpuc_controller \
-    libnpuc_frontend \
-    libnpuc_graph \
-    libnpuc_template \
     liboemcrypto \
     libprofileparamstorage \
     libqfp_sensortest \
     librecordalive \
     libril_sem \
-    libsait_npu_compiler \
     libsec-ril \
     libsecaudiocoreutils \
     libsecaudioinfo \
@@ -137,12 +99,10 @@ PRODUCT_PACKAGES += \
     libswcnr \
     libsynaFpSensorTestNwd \
     libteecl \
-    libtoco_graphgen_export \
     libuniapi \
     libuniplugin \
     libuuid_vendor \
     libvkmanager_vendor \
-    libvpl \
     libwrappergps \
     libwvaidl \
     sensors.grip \