diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index a24223161..5ec66e8a5 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -218,11 +218,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name="com.todoroo.astrid.service.UpdateScreenFlow"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.Dialog" />
-
         <activity
             android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity"
             android:screenOrientation="portrait" />
diff --git a/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java b/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java
deleted file mode 100644
index 0bffc07c3..000000000
--- a/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.todoroo.astrid.service;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.os.Bundle;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-
-public class UpdateScreenFlow extends Activity {
-
-    private static final Logger log = LoggerFactory.getLogger(UpdateScreenFlow.class);
-
-    public static final String TOKEN_SCREENS = "token_screens"; //$NON-NLS-1$
-    private static final int REQUEST_CODE_SCREEN_FLOW = 5;
-
-    private ArrayList<String> screens;
-    private int currIndex;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        screens = getIntent().getStringArrayListExtra(TOKEN_SCREENS);
-        currIndex = 0;
-        if (screens.size() == 0) {
-            finish();
-        }
-
-        startActivityFromString(screens.get(0));
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_CODE_SCREEN_FLOW && resultCode == RESULT_OK) {
-            currIndex++;
-            if (currIndex < screens.size()) {
-                String next = screens.get(currIndex);
-                startActivityFromString(next);
-            } else {
-                finish();
-            }
-        } else {
-            finish();
-        }
-    }
-
-    private void startActivityFromString(String className) {
-        try {
-            Class<?> activityClass = Class.forName(className);
-            Intent intent = new Intent(this, activityClass);
-            startActivityForResult(intent, REQUEST_CODE_SCREEN_FLOW);
-        } catch (ClassNotFoundException | ActivityNotFoundException e) {
-            log.error(e.getMessage(), e);
-            finish();
-        }
-    }
-
-}