3 files changed, 7 insertions, 22 deletions
diff --git a/config/common.mk b/config/common.mk
index cace12a..b16e7a5 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -44,13 +44,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 endif
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    keyguard.no_require_sim=true \
-    ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
-    ro.url.legal.android_privacy=http://www.google.com/intl/%s/mobile/android/basic/privacy.html \
-    ro.com.android.wifi-watchlist=GoogleGuest \
-    ro.setupwizard.enterprise_mode=1 \
-    ro.com.android.dateformat=MM-dd-yyyy \
-    ro.com.android.dataroaming=false
+    keyguard.no_require_sim=true
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.build.selinux=1
@@ -154,7 +148,6 @@ PRODUCT_PACKAGES += \
 
 # Custom packages
 PRODUCT_PACKAGES += \
-    Launcher3 \
     Trebuchet \
     AudioFX \
     ReplicantWallpapers \
@@ -250,12 +243,14 @@ PRODUCT_PROPERTY_OVERRIDES += \
 ifneq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_PACKAGES += \
     procmem \
-    procrank \
+    procrank
+
+# Conditionally build in su
+ifeq ($(WITH_SU),true)
+PRODUCT_PACKAGES += \
     su
 endif
-
-PRODUCT_PROPERTY_OVERRIDES += \
-    persist.sys.root_access=0
+endif
 
 DEVICE_PACKAGE_OVERLAYS += vendor/replicant/overlay/common
 
diff --git a/config/common_full_tv.mk b/config/common_full_tv.mk
index 779b918..10b2a5c 100644
--- a/config/common_full_tv.mk
+++ b/config/common_full_tv.mk
@@ -1,7 +1,2 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_full.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif
diff --git a/config/common_mini_tv.mk b/config/common_mini_tv.mk
index 63f2bcf..86f1a6b 100644
--- a/config/common_mini_tv.mk
+++ b/config/common_mini_tv.mk
@@ -1,7 +1,2 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_mini.mk)
-
-ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
-    PRODUCT_COPY_FILES += \
-        vendor/cm/prebuilt/common/bootanimation/800.zip:system/media/bootanimation.zip
-endif