diff --git a/target/product/aosp_base_telephony.mk b/target/product/aosp_base_telephony.mk
index 0d4e333..f326a00 100644
--- a/target/product/aosp_base_telephony.mk
+++ b/target/product/aosp_base_telephony.mk
@@ -14,6 +14,3 @@
 # limitations under the License.
 #
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
-
-PRODUCT_PACKAGES += \
-    messaging
diff --git a/target/product/core.mk b/target/product/core.mk
index cc83b24..1715a7e 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -24,17 +24,13 @@
     BasicDreams \
     BlockedNumberProvider \
     BookmarkProvider \
-    Browser2 \
     BuiltInPrintService \
-    Calendar \
     CalendarProvider \
     CaptivePortalLogin \
     CertInstaller \
     Contacts \
-    DeskClock \
     DocumentsUI \
     DownloadProviderUi \
-    Email \
     ExactCalculator \
     ExternalStorageProvider \
     FusedLocation \
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 7dc0010..9af9482 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -23,7 +23,6 @@
 PRODUCT_PACKAGES += \
     ContactsProvider \
     DefaultContainerService \
-    Home \
     TelephonyProvider \
     UserDictionaryProvider \
     atrace \
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index c390ffd..7e007a4 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -23,16 +23,6 @@
     libfwdlockengine \
     WAPPushManager
 
-PRODUCT_PACKAGES += \
-    Galaxy4 \
-    HoloSpiralWallpaper \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    NoiseField \
-    PhaseBeam \
-    PhotoTable
-
 # Bluetooth:
 #   audio.a2dp.default is a system module. Generic system image includes
 #   audio.a2dp.default to support A2DP if board has the capability.
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index e266cc3..c40b39c 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -20,9 +20,6 @@
 PRODUCT_PACKAGES := \
     Bluetooth \
     BluetoothMidiService \
-    Camera2 \
-    Gallery2 \
-    Music \
     MusicFX \
     OneTimeInitializer \
     Provision \
@@ -41,12 +38,7 @@
     screenrecord
 
 PRODUCT_PACKAGES += \
-    librs_jni \
-    libvideoeditor_jni \
-    libvideoeditor_core \
-    libvideoeditor_osal \
-    libvideoeditor_videofilters \
-    libvideoeditorplayer \
+    librs_jni
 
 PRODUCT_PACKAGES += \
     audio.primary.default \
diff --git a/target/product/sdk_base.mk b/target/product/sdk_base.mk
index 1e5ed19..9af5100 100644
--- a/target/product/sdk_base.mk
+++ b/target/product/sdk_base.mk
@@ -22,14 +22,9 @@
 	CustomLocale \
 	Development \
 	Dialer \
-	Gallery2 \
 	Launcher3QuickStep \
-	Camera2 \
-	librs_jni \
 	LiveWallpapersPicker \
 	Mms \
-	Music \
-	Protips \
 	rild \
 	screenrecord \
 	SdkSetup \