diff --git a/Android.bp b/Android.bp
index 153a6fd5..bbf403ca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3862,40 +3862,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "STFlashTool",
-    owner: "motorola",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/STFlashTool",
-            ],
-            shared_libs: [
-                "libbase_shim",
-                "libcutils",
-                "libutils",
-                "liblog",
-                "libchrome",
-                "libbase",
-                "libhardware",
-                "libpower",
-                "libz",
-                "libhidlbase",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "android.hardware.biometrics.fingerprint@2.1-service-ets",
     owner: "motorola",
diff --git a/devon-vendor.mk b/devon-vendor.mk
index 4a4e07b5..18772da8 100644
--- a/devon-vendor.mk
+++ b/devon-vendor.mk
@@ -3093,7 +3093,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets2.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.biometrics.fingerprint@2.1-service-fpc2.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.nfc@1.2-service.st-moto.rc \
-    vendor/motorola/devon/proprietary/vendor/etc/init/hw/init.vendor.st21nfc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.vendor.st21nfc.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/init.ets.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.ets.rc \
     vendor/motorola/devon/proprietary/vendor/etc/init/init_thermal-engine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init_thermal-engine.rc \
     vendor/motorola/devon/proprietary/vendor/etc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \
@@ -3312,7 +3311,6 @@ PRODUCT_PACKAGES += \
     libvidhance_horizon_correction \
     libvidhance_stabilizer \
     vendor.egistecbix.hardware.fingerprint@4.0 \
-    STFlashTool \
     android.hardware.biometrics.fingerprint@2.1-service-ets \
     android.hardware.biometrics.fingerprint@2.1-service-fpc \
     thermal-engine
diff --git a/proprietary/vendor/bin/STFlashTool b/proprietary/vendor/bin/STFlashTool
deleted file mode 100755
index 7a9287b2..00000000
Binary files a/proprietary/vendor/bin/STFlashTool and /dev/null differ
diff --git a/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc b/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
index 2d6fac5e..b0e58414 100644
--- a/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
+++ b/proprietary/vendor/etc/init/android.hardware.nfc@1.2-service.st-moto.rc
@@ -1,10 +1,10 @@
-on property:init.svc.vendor.stflashtool=stopped && property:ro.vendor.hw.nfc=true
+on boot && property:ro.vendor.hw.nfc=true
     start vendor.st_nfc_hal_service
 
-on property:init.svc.vendor.stflashtool=stopped && property:ro.vendor.hw.nfc=st
+on boot && property:ro.vendor.hw.nfc=st
     start vendor.st_nfc_hal_service
 
-on property:init.svc.vendor.stflashtool=stopped && property:ro.vendor.hw.nfc=ese_st
+on boot && property:ro.vendor.hw.nfc=ese_st
     start vendor.st_nfc_hal_service
 
 service vendor.st_nfc_hal_service /vendor/bin/hw/android.hardware.nfc@1.2-service.st
diff --git a/proprietary/vendor/etc/init/hw/init.vendor.st21nfc.rc b/proprietary/vendor/etc/init/hw/init.vendor.st21nfc.rc
deleted file mode 100644
index 354b95ed..00000000
--- a/proprietary/vendor/etc/init/hw/init.vendor.st21nfc.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-
-# This file needs to be executed by vendor_init at boot of the device,
-# both in normal and factory mode.
-
-on post-fs
-	# Change ownership and permision of st nfc device
-	chown nfc nfc /dev/st21nfc
-	chmod 0660 /dev/st21nfc
-
-on property:ro.vendor.hw.nfc=true && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-on property:ro.vendor.hw.nfc=st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-on property:ro.vendor.hw.nfc=ese_st && property:persist.vendor.radio.multisim.config=*
-	start vendor.stflashtool
-
-service vendor.stflashtool /vendor/bin/STFlashTool -c /vendor/etc/st21nfc_conf.txt -P vendor.nfc.fw_status
-	group nfc
-	user nfc
-	oneshot
-	disabled