diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index 5f3c8e30b..7fe16b887 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -23,6 +23,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.FrameLayout;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.view.ActionMode;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.FragmentManager;
@@ -39,7 +40,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
 import javax.inject.Inject;
-import org.jetbrains.annotations.Nullable;
 import org.tasks.BuildConfig;
 import org.tasks.LocalBroadcastManager;
 import org.tasks.R;
diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
index 6cce83130..9c8f0bd29 100644
--- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
+++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
@@ -8,12 +8,12 @@ package com.todoroo.astrid.reminders;
 
 import static com.google.common.collect.Lists.transform;
 
+import androidx.annotation.Nullable;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import java.util.List;
 import javax.inject.Inject;
-import org.jetbrains.annotations.Nullable;
 import org.tasks.injection.ApplicationScope;
 import org.tasks.jobs.NotificationQueue;
 import org.tasks.jobs.ReminderEntry;
diff --git a/app/src/main/java/org/tasks/intents/TaskIntents.java b/app/src/main/java/org/tasks/intents/TaskIntents.java
index 07ff6fe05..baa8c4594 100644
--- a/app/src/main/java/org/tasks/intents/TaskIntents.java
+++ b/app/src/main/java/org/tasks/intents/TaskIntents.java
@@ -3,10 +3,10 @@ package org.tasks.intents;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import androidx.annotation.Nullable;
 import com.todoroo.astrid.activity.MainActivity;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.data.Task;
-import org.jetbrains.annotations.Nullable;
 
 public class TaskIntents {
 
diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java
index a02b4b28b..04f358cf3 100644
--- a/app/src/main/java/org/tasks/preferences/Preferences.java
+++ b/app/src/main/java/org/tasks/preferences/Preferences.java
@@ -17,6 +17,7 @@ import android.net.Uri;
 import android.os.Binder;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import androidx.annotation.Nullable;
 import androidx.core.app.NotificationCompat;
 import androidx.documentfile.provider.DocumentFile;
 import com.google.common.base.Strings;
@@ -28,8 +29,6 @@ import java.io.File;
 import java.util.Collection;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
-import org.jetbrains.annotations.Nullable;
-import org.tasks.BuildConfig;
 import org.tasks.R;
 import org.tasks.billing.Purchase;
 import org.tasks.data.TaskAttachment;
diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.java b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
index 37f743a0e..26a2d3e56 100644
--- a/app/src/main/java/org/tasks/ui/TaskListViewModel.java
+++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.java
@@ -5,6 +5,7 @@ import static com.todoroo.astrid.activity.TaskListFragment.FILE_METADATA_JOIN;
 import static com.todoroo.astrid.activity.TaskListFragment.GTASK_METADATA_JOIN;
 import static com.todoroo.astrid.activity.TaskListFragment.TAGS_METADATA_JOIN;
 
+import androidx.annotation.NonNull;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModel;
 import androidx.paging.DataSource.Factory;
@@ -25,7 +26,6 @@ import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.data.Task;
 import java.util.Arrays;
 import javax.inject.Inject;
-import org.jetbrains.annotations.NotNull;
 import org.tasks.data.CaldavTask;
 import org.tasks.data.GoogleTask;
 import org.tasks.data.LimitOffsetDataSource;
@@ -43,7 +43,7 @@ public class TaskListViewModel extends ViewModel {
   private Filter filter;
   private Property<?>[] properties;
 
-  public LiveData<PagedList<Task>> getTasks(@NotNull Filter filter, Property<?>[] properties) {
+  public LiveData<PagedList<Task>> getTasks(@NonNull Filter filter, Property<?>[] properties) {
     if (tasks == null
         || !filter.equals(this.filter)
         || !filter.getSqlQuery().equals(this.filter.getSqlQuery())