diff --git a/config/common.mk b/config/common.mk
index e2177cc3..88b94ee8 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -121,7 +121,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
 
-# T-Mobile theme engine
+# Theme engine
 include vendor/cm/config/themes_common.mk
 
 # Required CM packages
@@ -146,7 +146,6 @@ PRODUCT_PACKAGES += \
     LockClock \
     CMUpdater \
     CMAccount \
-    CMHome \
     CyanogenSetupWizard \
     CMSettingsProvider
 
diff --git a/config/telephony.mk b/config/telephony.mk
index da548459..355bde02 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -8,14 +8,9 @@ PRODUCT_COPY_FILES += \
 
 # Telephony packages
 PRODUCT_PACKAGES += \
-    Mms \
+    messaging \
     Stk \
-    CellBroadcastReceiver \
-    WhisperPush
-
-# Mms depends on SoundRecorder for recorded audio messages
-PRODUCT_PACKAGES += \
-    SoundRecorder
+    CellBroadcastReceiver
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \