diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java
index d96e122dd..04b115a62 100644
--- a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java
+++ b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java
@@ -130,167 +130,6 @@ public class Database extends AbstractDatabase {
     protected synchronized boolean onUpgrade(int oldVersion, int newVersion) {
         SqlConstructorVisitor visitor = new SqlConstructorVisitor();
         switch(oldVersion) {
-        case 1: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.RECURRENCE.accept(visitor, null));
-        }
-        case 2: {
-            for(Property<?> property : new Property<?>[] { Metadata.VALUE2,
-                    Metadata.VALUE3, Metadata.VALUE4, Metadata.VALUE5 }) {
-                database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                        property.accept(visitor, null));
-            }
-        }
-        case 3: {
-            database.execSQL(createTableSql(visitor, StoreObject.TABLE.name, StoreObject.PROPERTIES));
-
-            onCreateTables();
-        }
-        case 4: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.DETAILS.accept(visitor, null));
-        }
-        case 5: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.REMINDER_SNOOZE.accept(visitor, null));
-        }
-        case 6: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.DETAILS_DATE.accept(visitor, null));
-        }
-        case 7: {
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.CREATION_DATE.accept(visitor, null));
-        }
-        case 8: {
-            // not needed anymore
-        }
-        case 9: try {
-            Property<?>[] properties = new Property<?>[] { Task.UUID, Task.USER_ID };
-            for(Property<?> property : properties) {
-                database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                        property.accept(visitor, null) + " DEFAULT 0");
-            }
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 10:
-        case 11: try {
-            database.execSQL(createTableSql(visitor, TagData.TABLE.name, TagData.PROPERTIES));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 12:
-        case 13: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.MEMBERS.accept(visitor, null));
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.MEMBER_COUNT.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 14: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TASK_COUNT.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 15: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.LAST_SYNC.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 16: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.CREATOR_ID.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 17: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TAG_DESCRIPTION.accept(visitor, null));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 18: try {
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.VALUE6.accept(visitor, null));
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.VALUE7.accept(visitor, null));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 19:
-        case 20: try {
-            String tasks = Task.TABLE.name;
-            String id = Task.ID.name;
-            String remoteId = Task.UUID.name;
-
-            // Delete any items that have duplicate remote ids
-            String deleteDuplicates = String.format("DELETE FROM %s WHERE %s IN (SELECT %s.%s FROM %s, %s AS t2 WHERE %s.%s < t2.%s AND %s.%s = t2.%s AND %s.%s > 0 GROUP BY %s.%s)",
-                    tasks, id, tasks, id, tasks, tasks, tasks, id, id, tasks, remoteId, remoteId, tasks, remoteId, tasks, id);
-
-            // Change all items with remote id = 0 to be remote id = NULL
-            String changeZeroes = String.format("UPDATE %s SET %s = NULL WHERE %s = 0", tasks, remoteId, remoteId);
-
-            database.execSQL(deleteDuplicates);
-            database.execSQL(changeZeroes);
-
-            onCreateTables();
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 21:
-        case 22:
-        case 23:
-        case 24: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.REPEAT_UNTIL.accept(visitor, null));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-
-        case 25:
-        case 26: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TAG_ORDERING.accept(visitor, null));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 27: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.SOCIAL_REMINDER.accept(visitor, null));
-        } catch (SQLiteException e) {
-            log.error("db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 28:
-        case 29:
-            tryExecSQL(createTableSql(visitor, TagMetadata.TABLE.name, TagMetadata.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, UserActivity.TABLE.name, UserActivity.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskAttachment.TABLE.name, TaskAttachment.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskListMetadata.TABLE.name, TaskListMetadata.PROPERTIES));
-
-            tryExecSQL(addColumnSql(Task.TABLE, Task.PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.ATTACHMENTS_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.USER_ACTIVITIES_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.TASKS_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.METADATA_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.USER_ACTIVITIES_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Metadata.TABLE, Metadata.DELETION_DATE, visitor, "0"));
-
-        case 30:
-        case 31:
-        case 32:
-        case 33:
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.LAST_AUTOSYNC, visitor, null));
-
-        case 34:
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.IS_FOLDER, visitor, null));
-
-        return true;
         }
 
         return false;