diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index b83e5bd..7f901a3 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -99,8 +99,8 @@ remove_big_optional_apps() {
   rm -rf product/app/MarkupGoogle
   rm -rf product/app/talkback
   rm -rf product/priv-app/GoogleRestore
-  rm -rf product/priv-app/SetupWizard
   rm -rf product/priv-app/Velvet
+  rm -rf system_ext/priv-app/SetupWizard
 }
 
 ui_print "**********************"
@@ -232,7 +232,11 @@ if [ -n "$PRODUCT_BLOCK" ] && [ "$PRODUCT_STORAGE" -lt "$NEEDED_STORAGE_PRODUCT"
   fi
 fi
 if [ -n "$SYSTEM_EXT_BLOCK" ] && [ "$SYSTEM_EXT_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM_EXT" ]; then
-  error_no_space
+  remove_big_optional_apps
+  compute_apps_size
+  if [ "$SYSTEM_EXT_STORAGE" -lt "$NEEDED_STORAGE_SYSTEM_EXT" ]; then
+    error_no_space
+  fi
 fi
 
 ui_print "Generating addon.d file"
@@ -269,7 +273,7 @@ if [ -n "$SYSTEM_EXT_BLOCK" ]; then
   cp --preserve=a -r ./system_ext/* /system_ext
 fi
 
-if [ -e product/priv-app/SetupWizard ] ; then
+if [ -e system_ext/priv-app/SetupWizard ] ; then
   rm -rf "${SYSTEM_OUT}/system_ext/priv-app/Provision"
 fi