diff --git a/src/main/java/com/todoroo/astrid/dao/Database.java b/src/main/java/com/todoroo/astrid/dao/Database.java
index ba378f3bf..fb7f7e176 100644
--- a/src/main/java/com/todoroo/astrid/dao/Database.java
+++ b/src/main/java/com/todoroo/astrid/dao/Database.java
@@ -26,12 +26,12 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskAttachment;
 import com.todoroo.astrid.data.TaskListMetadata;
 import com.todoroo.astrid.data.UserActivity;
+import com.todoroo.astrid.provider.Astrid2TaskProvider;
+import com.todoroo.astrid.provider.Astrid3ContentProvider;
 
 import org.tasks.analytics.Tracker;
 import org.tasks.injection.ForApplication;
 
-import java.util.ArrayList;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -58,8 +58,8 @@ public class Database {
             TaskListMetadata.TABLE,
     };
 
-    private final ArrayList<DatabaseUpdateListener> listeners = new ArrayList<>();
     private final SQLiteOpenHelper helper;
+    private final Context context;
     private final Tracker tracker;
     private SQLiteDatabase database;
 
@@ -67,6 +67,7 @@ public class Database {
 
     @Inject
     public Database(@ForApplication Context context, Tracker tracker) {
+        this.context = context;
         this.tracker = tracker;
         helper = new DatabaseHelper(context, getName(), VERSION);
     }
@@ -179,14 +180,9 @@ public class Database {
         return sql.toString();
     }
 
-    public void addListener(DatabaseUpdateListener listener) {
-        listeners.add(listener);
-    }
-
     private void onDatabaseUpdated() {
-        for(DatabaseUpdateListener listener : listeners) {
-            listener.onDatabaseUpdated();
-        }
+        Astrid2TaskProvider.notifyDatabaseModification(context);
+        Astrid3ContentProvider.notifyDatabaseModification(context);
     }
 
     /**
diff --git a/src/main/java/com/todoroo/astrid/dao/DatabaseUpdateListener.java b/src/main/java/com/todoroo/astrid/dao/DatabaseUpdateListener.java
deleted file mode 100644
index 290306cf2..000000000
--- a/src/main/java/com/todoroo/astrid/dao/DatabaseUpdateListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.todoroo.astrid.dao;
-
-public interface DatabaseUpdateListener {
-    void onDatabaseUpdated();
-}
diff --git a/src/main/java/com/todoroo/astrid/service/StartupService.java b/src/main/java/com/todoroo/astrid/service/StartupService.java
index 08ee3f268..c11de954c 100644
--- a/src/main/java/com/todoroo/astrid/service/StartupService.java
+++ b/src/main/java/com/todoroo/astrid/service/StartupService.java
@@ -14,9 +14,6 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.backup.TasksXmlImporter;
 import com.todoroo.astrid.dao.Database;
-import com.todoroo.astrid.dao.DatabaseUpdateListener;
-import com.todoroo.astrid.provider.Astrid2TaskProvider;
-import com.todoroo.astrid.provider.Astrid3ContentProvider;
 
 import org.tasks.Broadcaster;
 import org.tasks.BuildConfig;
@@ -71,14 +68,6 @@ public class StartupService {
             return;
         }
 
-        database.addListener(new DatabaseUpdateListener() {
-            @Override
-            public void onDatabaseUpdated() {
-                Astrid2TaskProvider.notifyDatabaseModification(activity);
-                Astrid3ContentProvider.notifyDatabaseModification(activity);
-            }
-        });
-
         try {
             database.openForWriting();
         } catch (SQLiteException e) {