diff --git a/common.mk b/common.mk
index 1ad804c..6651e82 100644
--- a/common.mk
+++ b/common.mk
@@ -428,10 +428,6 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.servicetracker@1.1.vendor \
     vendor.qti.hardware.servicetracker@1.2.vendor
 
-# Remove unwanted packages
-PRODUCT_PACKAGES += \
-    RemovePackages
-
 # RIL
 PRODUCT_PACKAGES += \
     libprotobuf-cpp-full \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4e4661e..4a99b29 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -810,7 +810,7 @@ vendor/lib64/unnhal-acc-htp.so
 
 # NFC
 system/etc/nfcee_access.xml
--system_ext/app/NQNfcNci/NQNfcNci.apk
+-system_ext/app/NQNfcNci/NQNfcNci.apk;OVERRIDES=NfcNci
 system_ext/etc/permissions/com.nxp.nfc.nq.xml
 system_ext/framework/com.nxp.nfc.nq.jar
 system_ext/lib64/libnqnfc-nci.so
diff --git a/remove_packages/Android.mk b/remove_packages/Android.mk
deleted file mode 100644
index fcf8d93..0000000
--- a/remove_packages/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := RemovePackages
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_OVERRIDES_PACKAGES := NfcNci
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_SRC_FILES := /dev/null
-include $(BUILD_PREBUILT)