diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index 3ae69ebc..92e79022 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -76,7 +76,6 @@ public class SetupWizardUtils {
 
     private static final String GMS_PACKAGE = "com.google.android.gms";
     private static final String GMS_SUW_PACKAGE = "com.google.android.setupwizard";
-    private static final String GMS_TV_SUW_PACKAGE = "com.google.android.tungsten.setupwraith";
 
     private static final String PROP_BUILD_DATE = "ro.build.date.utc";
 
@@ -265,13 +264,6 @@ public class SetupWizardUtils {
             isEthernetConnected(context)) {
             disableComponent(context, WifiSetupActivity.class);
         }
-
-        // Google's ATV SUW is shipped as it requires platform signature.
-        // Disable it if GMS is not installed by user.
-        if (hasLeanback(context) &&
-            !PackageManagerUtils.isAppInstalled(context, GMS_PACKAGE)) {
-            disableApplication(context, GMS_TV_SUW_PACKAGE);
-        }
     }
 
     public static void disableComponentsForGMS(Context context) {
@@ -299,11 +291,6 @@ public class SetupWizardUtils {
         return comp;
     }
 
-    public static void disableApplication(Context context, String appname) {
-        context.getPackageManager().setApplicationEnabledSetting(appname,
-                COMPONENT_ENABLED_STATE_DISABLED, 0);
-    }
-
     public static void disableComponentSets(Context context, int flags) {
         setComponentListEnabledState(context, getComponentSets(context, flags),
                 COMPONENT_ENABLED_STATE_DISABLED);