diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index dfa9521..3575af7 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -72,8 +72,9 @@ unzip -o "$ZIP"
 exec_util "rm -rf META-INF"
 cd system
 if [ "$MEM" -lt "$LOWMEM" ]; then
-  ui_print "Low RAM device detected, removing Google SuW"
+  ui_print "Low RAM device detected, removing large extras"
   exec_util "rm -rf priv-app/SetupWizard"
+  exec_util "rm -rf priv-app/Velvet"
 fi
 ui_print "Generating addon.d file"
 cat addon.d/addond_head > addon.d/30-gapps.sh
diff --git a/common/Android.mk b/common/Android.mk
index 8790e2d..bf93a7d 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -135,6 +135,17 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := com.google.android.maps
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE_SUFFIX := .jar
+include $(BUILD_PREBUILT)
+
+ifeq ($(TARGET_IS_GROUPER),)
 include $(CLEAR_VARS)
 LOCAL_MODULE := SetupWizard
 LOCAL_MODULE_OWNER := gapps
@@ -159,14 +170,5 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
+endif
 endif
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 3a9a736..f9cf918 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -30,6 +30,10 @@ PRODUCT_PACKAGES += \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
-    SetupWizard \
-    Velvet \
     com.google.android.maps
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    SetupWizard \
+    Velvet
+endif
diff --git a/extract-files.sh b/extract-files.sh
index 5a5a421..675c4dc 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -45,5 +45,6 @@ fi
 setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT"
 
 extract "$MY_DIR"/proprietary-files-common.txt "$SRC"
+extract "$MY_DIR"/proprietary-files-common-nongrouper.txt "$SRC"
 
 "$MY_DIR"/setup-makefiles.sh
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
new file mode 100644
index 0000000..18a1212
--- /dev/null
+++ b/proprietary-files-common-nongrouper.txt
@@ -0,0 +1,2 @@
+-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
+-priv-app/Velvet/Velvet.apk;PRESIGNED
diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt
index d67fc87..1ed6904 100644
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -9,8 +9,6 @@
 -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
 -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED
 -priv-app/Phonesky/Phonesky.apk;PRESIGNED
--priv-app/SetupWizard/SetupWizard.apk;PRESIGNED
--priv-app/Velvet/Velvet.apk;PRESIGNED
 
 -framework/com.google.android.maps.jar;PRESIGNED
 
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 44e6a89..7a4f53e 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -45,6 +45,13 @@ write_headers "arm arm64 x86"
 # Common gapps
 write_makefiles "$MY_DIR"/proprietary-files-common.txt
 
+# Gapps that are too large for grouper
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK"
+echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK"
+write_makefiles "$MY_DIR"/proprietary-files-common-nongrouper.txt
+echo "endif" >> "$PRODUCTMK"
+echo "endif" >> "$ANDROIDMK"
+
 sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 
 # We are done with common