diff --git a/src/amazon/java/org/tasks/injection/BroadcastComponent.java b/src/amazon/java/org/tasks/injection/BroadcastComponent.java
index defafdfe9..38c99ff3a 100644
--- a/src/amazon/java/org/tasks/injection/BroadcastComponent.java
+++ b/src/amazon/java/org/tasks/injection/BroadcastComponent.java
@@ -10,7 +10,6 @@ import com.todoroo.astrid.timers.TimerTaskCompleteListener;
 import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
-import org.tasks.receivers.FirstLaunchReceiver;
 import org.tasks.receivers.ListNotificationReceiver;
 import org.tasks.receivers.MyPackageReplacedReceiver;
 import org.tasks.receivers.RefreshReceiver;
@@ -44,8 +43,6 @@ public interface BroadcastComponent {
 
     void inject(CompleteTaskReceiver completeTaskReceiver);
 
-    void inject(FirstLaunchReceiver firstLaunchReceiver);
-
     void inject(ListNotificationReceiver listNotificationReceiver);
 
     void inject(BootCompletedReceiver bootCompletedReceiver);
diff --git a/src/generic/java/org/tasks/injection/BroadcastComponent.java b/src/generic/java/org/tasks/injection/BroadcastComponent.java
index defafdfe9..38c99ff3a 100644
--- a/src/generic/java/org/tasks/injection/BroadcastComponent.java
+++ b/src/generic/java/org/tasks/injection/BroadcastComponent.java
@@ -10,7 +10,6 @@ import com.todoroo.astrid.timers.TimerTaskCompleteListener;
 import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
-import org.tasks.receivers.FirstLaunchReceiver;
 import org.tasks.receivers.ListNotificationReceiver;
 import org.tasks.receivers.MyPackageReplacedReceiver;
 import org.tasks.receivers.RefreshReceiver;
@@ -44,8 +43,6 @@ public interface BroadcastComponent {
 
     void inject(CompleteTaskReceiver completeTaskReceiver);
 
-    void inject(FirstLaunchReceiver firstLaunchReceiver);
-
     void inject(ListNotificationReceiver listNotificationReceiver);
 
     void inject(BootCompletedReceiver bootCompletedReceiver);
diff --git a/src/googleplay/java/org/tasks/injection/BroadcastComponent.java b/src/googleplay/java/org/tasks/injection/BroadcastComponent.java
index 58eabceb4..02113db18 100644
--- a/src/googleplay/java/org/tasks/injection/BroadcastComponent.java
+++ b/src/googleplay/java/org/tasks/injection/BroadcastComponent.java
@@ -10,7 +10,6 @@ import com.todoroo.astrid.timers.TimerTaskCompleteListener;
 import org.tasks.locale.receiver.FireReceiver;
 import org.tasks.receivers.BootCompletedReceiver;
 import org.tasks.receivers.CompleteTaskReceiver;
-import org.tasks.receivers.FirstLaunchReceiver;
 import org.tasks.receivers.GoogleTaskPushReceiver;
 import org.tasks.receivers.ListNotificationReceiver;
 import org.tasks.receivers.MyPackageReplacedReceiver;
@@ -47,8 +46,6 @@ public interface BroadcastComponent {
 
     void inject(CompleteTaskReceiver completeTaskReceiver);
 
-    void inject(FirstLaunchReceiver firstLaunchReceiver);
-
     void inject(ListNotificationReceiver listNotificationReceiver);
 
     void inject(BootCompletedReceiver bootCompletedReceiver);
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index df8c3b367..5f941f158 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -429,7 +429,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receivers.FirstLaunchReceiver"/>
         <receiver android:name=".receivers.CompleteTaskReceiver"/>
 
         <receiver android:name=".receivers.MyPackageReplacedReceiver">
diff --git a/src/main/java/com/todoroo/astrid/service/StartupService.java b/src/main/java/com/todoroo/astrid/service/StartupService.java
index b79f9627b..86cb6dbb6 100644
--- a/src/main/java/com/todoroo/astrid/service/StartupService.java
+++ b/src/main/java/com/todoroo/astrid/service/StartupService.java
@@ -31,6 +31,7 @@ import org.tasks.analytics.Tracker;
 import org.tasks.analytics.Tracking;
 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.Preferences;
+import org.tasks.scheduling.BackgroundScheduler;
 
 import java.io.File;
 import java.util.List;
@@ -53,11 +54,13 @@ public class StartupService {
     private final TagDataDao tagDataDao;
     private final TagService tagService;
     private final MetadataDao metadataDao;
+    private final BackgroundScheduler backgroundScheduler;
 
     @Inject
     public StartupService(@ForApplication Context context, Database database, Preferences preferences,
                           TaskDeleter taskDeleter, Broadcaster broadcaster, Tracker tracker,
-                          TagDataDao tagDataDao, TagService tagService, MetadataDao metadataDao) {
+                          TagDataDao tagDataDao, TagService tagService, MetadataDao metadataDao,
+                          BackgroundScheduler backgroundScheduler) {
         this.context = context;
         this.database = database;
         this.preferences = preferences;
@@ -67,6 +70,7 @@ public class StartupService {
         this.tagDataDao = tagDataDao;
         this.tagService = tagService;
         this.metadataDao = metadataDao;
+        this.backgroundScheduler = backgroundScheduler;
     }
 
     /** Called when this application is started up */
@@ -100,9 +104,7 @@ public class StartupService {
             taskDeleter.deleteTasksWithEmptyTitles(null);
         }).start();
 
-        if (lastVersion == 0) {
-            broadcaster.firstLaunch();
-        }
+        backgroundScheduler.scheduleEverything();
     }
 
     private void upgrade(int from, int to) {
diff --git a/src/main/java/org/tasks/Broadcaster.java b/src/main/java/org/tasks/Broadcaster.java
index 00968d183..b53e2b45f 100644
--- a/src/main/java/org/tasks/Broadcaster.java
+++ b/src/main/java/org/tasks/Broadcaster.java
@@ -9,7 +9,6 @@ import com.todoroo.astrid.data.Task;
 
 import org.tasks.injection.ForApplication;
 import org.tasks.receivers.CompleteTaskReceiver;
-import org.tasks.receivers.FirstLaunchReceiver;
 
 import javax.inject.Inject;
 
@@ -57,8 +56,4 @@ public class Broadcaster {
         intent.putExtra(AstridApiConstants.EXTRAS_VALUES, values);
         context.sendBroadcast(intent);
     }
-
-    public void firstLaunch() {
-        context.sendBroadcast(new Intent(context, FirstLaunchReceiver.class));
-    }
 }
diff --git a/src/main/java/org/tasks/receivers/FirstLaunchReceiver.java b/src/main/java/org/tasks/receivers/FirstLaunchReceiver.java
deleted file mode 100644
index 6b2cdce1e..000000000
--- a/src/main/java/org/tasks/receivers/FirstLaunchReceiver.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.tasks.receivers;
-
-import android.content.Context;
-import android.content.Intent;
-
-import org.tasks.injection.BroadcastComponent;
-import org.tasks.injection.InjectingBroadcastReceiver;
-import org.tasks.scheduling.BackgroundScheduler;
-
-import javax.inject.Inject;
-
-import timber.log.Timber;
-
-public class FirstLaunchReceiver extends InjectingBroadcastReceiver {
-
-    @Inject BackgroundScheduler backgroundScheduler;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        super.onReceive(context, intent);
-
-        Timber.d("onReceive(context, %s)", intent);
-
-        backgroundScheduler.scheduleBackupService();
-        backgroundScheduler.scheduleMidnightRefresh();
-    }
-
-    @Override
-    protected void inject(BroadcastComponent component) {
-        component.inject(this);
-    }
-}