diff --git a/proprietary/vendor/bin/ATFWD-daemon b/proprietary/vendor/bin/ATFWD-daemon
deleted file mode 100755
index 65adaca..0000000
Binary files a/proprietary/vendor/bin/ATFWD-daemon and /dev/null differ
diff --git a/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy b/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy
deleted file mode 100644
index d556f3a..0000000
--- a/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2020 Qualcomm Technologies, Inc.
-# All Rights Reserved.
-# Confidential and Proprietary - Qualcomm Technologies, Inc
-#
-# Not a contribution.
-#
-# Copyright (C) 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-munmap: 1
-getuid: 1
-writev: 1
-prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-openat: 1
-futex: 1
-close: 1
-read: 1
-newfstatat: 1
-fstat: 1
-#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_SET_MAX_THREADS || arg1 == BINDER_VERSION
-ioctl: 1
-mremap: 1
-readlinkat: 1
-pread64: 1
-fstatfs: 1
-rt_sigprocmask: 1
-faccessat: 1
-sendto: 1
-rt_sigaction: 1
-socket: arg0 == AF_UNIX || arg0 == AF_QIPCRTR
-recvfrom: 1
-getsockname: 1
-getdents64: 1
-fcntl: 1
-nanosleep: 1
-getrandom: 1
-clone: 1
-pipe2: 1
-exit_group: 1
-write: 1
-exit: 1
-getpid: 1
-sigaltstack: 1
-getrlimit: 1
-restart_syscall: 1
-setsockopt: 1
-sched_getscheduler: 1
-rt_sigreturn: 1
-execve: 1
-madvise: 1
-set_tid_address: 1
-connect: 1
-ppoll: 1
-clock_gettime: 1
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so b/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
deleted file mode 100644
index 0ecbd46..0000000
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so and /dev/null differ
diff --git a/sm6375-common-vendor.mk b/sm6375-common-vendor.mk
index 1c8767b..219b8e2 100644
--- a/sm6375-common-vendor.mk
+++ b/sm6375-common-vendor.mk
@@ -106,7 +106,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6375-common/proprietary/system_ext/lib64/vendor.qti.hardware.qccsyshal@1.2.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.hardware.qccsyshal@1.2.so \
     vendor/motorola/sm6375-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.0.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.0.so \
     vendor/motorola/sm6375-common/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \
-    vendor/motorola/sm6375-common/proprietary/vendor/bin/ATFWD-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/ATFWD-daemon \
     vendor/motorola/sm6375-common/proprietary/vendor/bin/adpl:$(TARGET_COPY_OUT_VENDOR)/bin/adpl \
     vendor/motorola/sm6375-common/proprietary/vendor/bin/adsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/adsprpcd \
     vendor/motorola/sm6375-common/proprietary/vendor/bin/cdsprpcd:$(TARGET_COPY_OUT_VENDOR)/bin/cdsprpcd \
@@ -320,7 +319,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql:$(TARGET_COPY_OUT_VENDOR)/etc/qcril_database/upgrade/other/6_version_change_property_table_qcrilnr.sql \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config \
-    vendor/motorola/sm6375-common/proprietary/vendor/etc/seccomp_policy/atfwd@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/atfwd@2.0.policy \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base-arm.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base-arm.policy \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext-arm.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext-arm.policy \
     vendor/motorola/sm6375-common/proprietary/vendor/etc/seccomp_policy/gnss@2.0-base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/gnss@2.0-base.policy \
@@ -930,7 +928,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qccsyshal@1.0.so \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.qteeconnector@1.0.so \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.am@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.am@1.0.so \
-    vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.0.so \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.1.so \
     vendor/motorola/sm6375-common/proprietary/vendor/lib64/vendor.qti.hardware.radio.ims@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.radio.ims@1.2.so \