diff --git a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
index 18dc693c..da783afc 100644
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -243,19 +243,6 @@ public abstract class BaseSetupWizardActivity extends AppCompatActivity implemen
         }
     }
 
-    protected final void finishAllAppTasks() {
-        List<ActivityManager.AppTask> appTasks =
-                getSystemService(ActivityManager.class).getAppTasks();
-
-        for (ActivityManager.AppTask task : appTasks) {
-            if (LOGV) {
-                Log.v(TAG, "Finishing task=" + task.toString());
-            }
-            task.finishAndRemoveTask();
-        }
-        finish();
-    }
-
     public void finish() {
         if (LOGV) {
             Log.v(TAG, "finish");
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index 30b7eabe..25c5c8cc 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -183,7 +183,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
     }
 
     private void completeSetup() {
-        Log.i(TAG, "Setup complete!");
         handleEnableMetrics(mSetupWizardApp);
         handleNavKeys(mSetupWizardApp);
         handleRecoveryUpdate(mSetupWizardApp);
@@ -191,8 +190,10 @@ public class FinishActivity extends BaseSetupWizardActivity {
         final WallpaperManager wallpaperManager =
                 WallpaperManager.getInstance(mSetupWizardApp);
         wallpaperManager.forgetLoadedWallpaper();
-        finishAllAppTasks();
+        finishAffinity();
+        nextAction(RESULT_OK);
         SetupWizardUtils.enableStatusBar();
+        Log.i(TAG, "Setup complete!");
     }
 
     private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {
diff --git a/src/org/lineageos/setupwizard/SetupWizardActivity.java b/src/org/lineageos/setupwizard/SetupWizardActivity.java
index 91e107bc..2a6a12c9 100644
--- a/src/org/lineageos/setupwizard/SetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/SetupWizardActivity.java
@@ -26,13 +26,10 @@ import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
 import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.util.Log;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.google.android.setupcompat.util.WizardManagerHelper;
-
 import org.lineageos.setupwizard.util.SetupWizardUtils;
 import org.lineageos.setupwizard.wizardmanager.WizardManager;
 
@@ -45,33 +42,20 @@ public class SetupWizardActivity extends AppCompatActivity {
         if (LOGV) {
             Log.v(TAG, "onCreate savedInstanceState=" + savedInstanceState);
         }
-        if (SetupWizardUtils.hasGMS(this)) {
-            SetupWizardUtils.disableHome(this);
-            if (SetupWizardUtils.isOwner()) {
-                Settings.Global.putInt(getContentResolver(),
-                        Settings.Global.ASSISTED_GPS_ENABLED, 1);
-            }
-            finish();
-        } else if (WizardManagerHelper.isUserSetupComplete(this)
-                && !SetupWizardUtils.isManagedProfile(this)) {
-            SetupWizardUtils.startSetupWizardExitProcedure(this);
-            finish();
+        SetupWizardUtils.enableComponent(this, WizardManager.class);
+        Intent intent = new Intent(ACTION_LOAD);
+        if (SetupWizardUtils.isOwner()) {
+            intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
+        } else if (SetupWizardUtils.isManagedProfile(this)) {
+            intent.putExtra(EXTRA_SCRIPT_URI, getString(
+                    R.string.lineage_wizard_script_managed_profile_uri));
         } else {
-            SetupWizardUtils.enableComponent(this, WizardManager.class);
-            Intent intent = new Intent(ACTION_LOAD);
-            if (SetupWizardUtils.isOwner()) {
-                intent.putExtra(EXTRA_SCRIPT_URI, getString(R.string.lineage_wizard_script_uri));
-            } else if (SetupWizardUtils.isManagedProfile(this)) {
-                intent.putExtra(EXTRA_SCRIPT_URI, getString(
-                        R.string.lineage_wizard_script_managed_profile_uri));
-            } else {
-                intent.putExtra(EXTRA_SCRIPT_URI,
-                        getString(R.string.lineage_wizard_script_user_uri));
-            }
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | FLAG_GRANT_READ_URI_PERMISSION);
-            intent.setPackage(getPackageName());
-            startActivity(intent);
-            finish();
+            intent.putExtra(EXTRA_SCRIPT_URI,
+                    getString(R.string.lineage_wizard_script_user_uri));
         }
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | FLAG_GRANT_READ_URI_PERMISSION);
+        intent.setPackage(getPackageName());
+        startActivity(intent);
+        finish();
     }
 }
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 97cc8b3a..1b47ef43 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -22,6 +22,7 @@ import android.app.StatusBarManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.Settings;
 import android.util.Log;
 
 import org.lineageos.setupwizard.util.SetupWizardUtils;
@@ -85,6 +86,13 @@ public class SetupWizardApp extends Application {
         }
         sStatusBarManager = SetupWizardUtils.disableStatusBar(this);
         mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
+        if (SetupWizardUtils.hasGMS(this)) {
+            SetupWizardUtils.disableHome(this);
+            if (SetupWizardUtils.isOwner()) {
+                Settings.Global.putInt(getContentResolver(),
+                        Settings.Global.ASSISTED_GPS_ENABLED, 1);
+            }
+        }
     }
 
     public static StatusBarManager getStatusBarManager() {