diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
index 4aa32d842..4e4092941 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/controllers/NumberButtonController.java
@@ -23,16 +23,12 @@ import android.support.annotation.*;
 
 import com.google.auto.factory.*;
 
-import org.isoron.uhabits.activities.habits.list.views.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.preferences.*;
 
 @AutoFactory
 public class NumberButtonController
 {
-    @Nullable
-    private NumberButtonView view;
-
     @Nullable
     private Listener listener;
 
@@ -80,11 +76,6 @@ public class NumberButtonController
         this.listener = listener;
     }
 
-    public void setView(@Nullable NumberButtonView view)
-    {
-        this.view = view;
-    }
-
     public interface Listener
     {
         /**
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
index beed5b034..739e37902 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
@@ -112,7 +112,7 @@ public class NumberButtonView extends View
         postInvalidate();
     }
 
-    public void setController(final NumberButtonController controller)
+    public void setController(@NonNull NumberButtonController controller)
     {
         setOnClickListener(v -> controller.onClick());
         setOnLongClickListener(v ->
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
index 19479bd5a..95193a4fd 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.java
@@ -234,7 +234,6 @@ public class NumberPanelView extends LinearLayout
         NumberButtonController buttonController =
             buttonControllerFactory.create(habit, timestamp);
         buttonController.setListener(controller);
-        buttonController.setView(buttonView);
         buttonView.setController(buttonController);
     }
 
@@ -259,6 +258,5 @@ public class NumberPanelView extends LinearLayout
 
     public interface Controller extends NumberButtonController.Listener
     {
-
     }
 }