diff --git a/app/src/generic/java/org/tasks/location/GeofenceApi.java b/app/src/generic/java/org/tasks/location/GeofenceApi.java
index 47d91f35f..983a684ad 100644
--- a/app/src/generic/java/org/tasks/location/GeofenceApi.java
+++ b/app/src/generic/java/org/tasks/location/GeofenceApi.java
@@ -10,6 +10,8 @@ public class GeofenceApi {
   @Inject
   public GeofenceApi() {}
 
+  public void register(Location location) {}
+
   public void register(List<Location> activeGeofences) {}
 
   public void cancel(Location geofence) {}
diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
index edceb0081..f3cca9412 100644
--- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
@@ -191,8 +191,6 @@ public class Upgrader {
   }
 
   private void applyCaldavGeo() {
-    List<CaldavTask> updated = newArrayList();
-
     List<Long> tasksWithLocations =
         Lists.transform(locationDao.getActiveGeofences(), Location::getTask);
 
@@ -216,7 +214,6 @@ public class Upgrader {
     }
 
     batch(tasksWithLocations, taskDao::touch);
-    caldavDao.update(updated);
   }
 
   private void applyCaldavSubtasks() {
diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.java b/app/src/main/java/org/tasks/jobs/WorkManager.java
index daeab0561..eb8d8e942 100644
--- a/app/src/main/java/org/tasks/jobs/WorkManager.java
+++ b/app/src/main/java/org/tasks/jobs/WorkManager.java
@@ -57,7 +57,6 @@ public class WorkManager {
   private static final String TAG_MIDNIGHT_REFRESH = "tag_midnight_refresh";
   private static final String TAG_SYNC = "tag_sync";
   private static final String TAG_BACKGROUND_SYNC = "tag_background_sync";
-  private static final String TAG_REVERSE_GEOCODE = "tag_reverse_geocode";
 
   private final Context context;
   private final Preferences preferences;
@@ -105,6 +104,9 @@ public class WorkManager {
   }
 
   public void sync(boolean immediate) {
+    if (workManager == null) {
+      return;
+    }
     Constraints constraints =
         new Constraints.Builder()
             .setRequiredNetworkType(
diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.java b/app/src/main/java/org/tasks/ui/LocationControlSet.java
index 452aba260..28a530001 100644
--- a/app/src/main/java/org/tasks/ui/LocationControlSet.java
+++ b/app/src/main/java/org/tasks/ui/LocationControlSet.java
@@ -28,7 +28,6 @@ import com.google.common.base.Strings;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import javax.inject.Inject;
 import org.tasks.R;