diff --git a/init/bin/init.qcom.early_boot.sh b/init/bin/init.qcom.early_boot.sh
index 96337bad..f4bb993a 100755
--- a/init/bin/init.qcom.early_boot.sh
+++ b/init/bin/init.qcom.early_boot.sh
@@ -443,15 +443,6 @@ case "$target" in
            ;;
  esac
 
-baseband=`getprop ro.baseband`
-#enable atfwd daemon all targets except sda, apq, qcs
-case "$baseband" in
-    "apq" | "sda" | "qcs" )
-        setprop persist.vendor.radio.atfwd.start false;;
-    *)
-        setprop persist.vendor.radio.atfwd.start true;;
-esac
-
 #set default lcd density
 #Since lcd density has read only
 #property, it will not overwrite previous set
diff --git a/init/etc/init.qcom.rc b/init/etc/init.qcom.rc
index bce1667b..180ace40 100644
--- a/init/etc/init.qcom.rc
+++ b/init/etc/init.qcom.rc
@@ -563,12 +563,6 @@ on property:sys.boot_completed=1
     #Reinit lmkd to reconfigure lmkd properties
     setprop lmkd.reinit 1
 
-on property:persist.vendor.radio.atfwd.start=false
-    stop vendor.atfwd
-
-on property:vendor.radio.atfwd.start=false
-    stop vendor.atfwd
-
 # corefile limit
 on property:persist.debug.trace=1
     mkdir /data/core 0777 root root
@@ -783,11 +777,6 @@ service qvop-daemon /vendor/bin/qvop-daemon
     user system
     group system drmrpc
 
-service vendor.atfwd /vendor/bin/ATFWD-daemon
-    class late_start
-    user system
-    group system radio
-
 service hostapd_fst /vendor/bin/hw/hostapd -dd -g /data/vendor/wifi/hostapd/global
     class main
     capabilities NET_ADMIN NET_RAW
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 57536d54..e28dbc3d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -255,7 +255,6 @@ vendor/lib64/libminksocket.so|33a9e55842c1927539b8ed5d30bb3ddb12599a5e
 vendor/etc/init/ipa_fws.rc|f1826b81077f51470c97781823f109f12361ac8b
 
 # Data - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
-vendor/bin/ATFWD-daemon|98b712409955b49330f7e179da8019be723850a3
 vendor/bin/adpl|4bcb42796dbcfba43dbc98a146b4d55ee9c4b06c
 vendor/bin/embmsslServer|851286d784bddf00c2e17060577c6476d73215c6
 vendor/bin/ipacm-diag|38d585eaa2d002ee0ef819201c13c731c6691551
@@ -286,7 +285,6 @@ vendor/lib64/vendor.qti.hardware.embmssl@1.0-adapter-helper.so|af284f9fee0a956d8
 vendor/lib64/vendor.qti.hardware.embmssl@1.0.so;MODULE_SUFFIX=_vendor|3d1ec041f6ecf79a1e732c17d302d9e6dc58456c
 vendor/lib64/vendor.qti.hardware.embmssl@1.1-adapter-helper.so|03631de9b3ad21566203258ceea743554019a19e
 vendor/lib64/vendor.qti.hardware.embmssl@1.1.so;MODULE_SUFFIX=_vendor|4cfb0e3f1f7880ae5a72dadf78beb416346f97f6
-vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so;MODULE_SUFFIX=_vendor|ed5b893fc89f0f754bc0377ee8c02bd0b88157d7
 
 # Display (HDR)
 vendor/etc/hdr_config.cfg
@@ -702,7 +700,6 @@ vendor/bin/qtigetprop|4d0e9e9adb56cdbe4562c2fa54416aa5eb2968e8
 vendor/bin/qtisetprop|232b6b778234ecf9806f4b9d9a4de9c28b70c108
 vendor/etc/init/init-qcril-data.rc|890ac72fa49d0e52a263175a7b5b550539287800
 vendor/etc/init/qcrild.rc|320b644319182f96e494ea30de26cb52b448f592
-vendor/etc/seccomp_policy/atfwd@2.0.policy|da0ecc6378a5df652f412c4aac8423e50f27a53e
 vendor/lib64/deviceInfoServiceModule.so|d9fb334e23fc38ac9b105af43b76c7f796f3d02a
 vendor/lib64/liblqe.so|a9c9cc6539482655a5ef1c612050e7cd961c2fd3
 vendor/lib64/libqcrilFramework.so|822746346ea6fb7a52b5fbedef94c4f58bc6e2ca