diff --git a/Android.bp b/Android.bp
index db47442..affd6b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -479,37 +479,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.gnss@2.1-impl",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libhidlbase",
-                "libutils",
-                "libhardware",
-                "vendor.samsung.hardware.gnss@2.0",
-                "vendor.samsung.hardware.gnss@2.1",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libSEF.quram",
     owner: "samsung",
@@ -2267,63 +2236,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.gnss@2.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.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.samsung.hardware.gnss@2.1",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.1.so",
-            ],
-            shared_libs: [
-                "vendor.samsung.hardware.gnss@2.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.samsung.hardware.radio-V1-ndk",
     owner: "samsung",
@@ -2693,45 +2605,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "vendor.samsung.hardware.gnss@2.1-service",
-    owner: "samsung",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libbase",
-                "libutils",
-                "libhardware",
-                "libbinder",
-                "libhidlbase",
-                "android.frameworks.sensorservice@1.0",
-                "android.hardware.gnss@1.0",
-                "android.hardware.gnss@1.1",
-                "android.hardware.gnss@2.0",
-                "android.hardware.gnss@2.1",
-                "vendor.samsung.hardware.gnss@2.0",
-                "vendor.samsung.hardware.gnss@2.1",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    relative_install_path: "hw",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "tzts_daemon",
     owner: "samsung",
diff --git a/proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service b/proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service
deleted file mode 100755
index 39b7415..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service and /dev/null differ
diff --git a/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc b/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc
deleted file mode 100644
index e28630e..0000000
--- a/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service sec_gnss_service /vendor/bin/hw/vendor.samsung.hardware.gnss@2.1-service
-    class main
-    user system
-    group system gps
diff --git a/proprietary/vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so b/proprietary/vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so
deleted file mode 100644
index 6483e65..0000000
Binary files a/proprietary/vendor/lib64/hw/vendor.samsung.hardware.gnss@2.1-impl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.0.so
deleted file mode 100644
index d23091d..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.0.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.1.so
deleted file mode 100644
index edd110f..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.gnss@2.1.so and /dev/null differ
diff --git a/universal9830-common-vendor.mk b/universal9830-common-vendor.mk
index cf6a314..c172c9e 100644
--- a/universal9830-common-vendor.mk
+++ b/universal9830-common-vendor.mk
@@ -11,7 +11,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/gnss/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
     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/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/plmn_delta.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta.bin \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/plmn_delta_attaio.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_attaio.bin \
     vendor/samsung/universal9830-common/proprietary/vendor/etc/plmn_delta_usagsm.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_usagsm.bin \
@@ -108,7 +107,6 @@ PRODUCT_PACKAGES += \
     android.hardware.gnss@2.1-impl \
     flp.default \
     gps.default \
-    vendor.samsung.hardware.gnss@2.1-impl \
     libSEF.quram \
     libVendorSemDataProps \
     libVendorSemTelephonyProps \
@@ -170,8 +168,6 @@ PRODUCT_PACKAGES += \
     libuniplugin \
     libvpl \
     sensors.flicker \
-    vendor.samsung.hardware.gnss@2.0 \
-    vendor.samsung.hardware.gnss@2.1 \
     vendor.samsung.hardware.radio-V1-ndk \
     vendor.samsung.hardware.radio.bridge-V1-ndk \
     vendor.samsung.hardware.radio.channel-V1-ndk \
@@ -189,7 +185,6 @@ PRODUCT_PACKAGES += \
     gps \
     lhd \
     rild \
-    vendor.samsung.hardware.gnss@2.1-service \
     tzts_daemon
 
 PRODUCT_PACKAGES += \