diff --git a/product.mk b/product.mk
index f38eeb1..ade54c1 100644
--- a/product.mk
+++ b/product.mk
@@ -57,16 +57,6 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/extra/overlay
 ## Recovery
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.vendor.recovery_update=true
 
-## Remove Dialer Apps
-ifneq ($(filter %shieldtablet %yellowstone,$(TARGET_PRODUCT)),)
-PRODUCT_PACKAGES += remove-dialer
-endif
-
-## Remove Telephony Apps
-ifneq ($(filter %flo %flox %deb %debx %nx %nx_tab %sphynx,$(TARGET_PRODUCT)),)
-PRODUCT_PACKAGES += remove-telephony
-endif
-
 ## SUW
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     setupwizard.feature_deferred_snooze_allow_never=true
diff --git a/remove-dialer/Android.mk b/remove-dialer/Android.mk
deleted file mode 100644
index d274a16..0000000
--- a/remove-dialer/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := remove-dialer
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_OVERRIDES_PACKAGES := Dialer GoogleDialer
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_SRC_FILES := /dev/null
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)
diff --git a/remove-telephony/Android.mk b/remove-telephony/Android.mk
deleted file mode 100644
index 99875da..0000000
--- a/remove-telephony/Android.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := remove-telephony
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_OVERRIDES_PACKAGES := CarrierServicesGoogle Dialer GoogleDialer Messages Messaging Telecom Telephony
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_SRC_FILES := /dev/null
-LOCAL_CERTIFICATE := PRESIGNED
-include $(BUILD_PREBUILT)