diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index fb945a50..44c604f1 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -25,7 +25,6 @@ import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBDevice.State;
 import nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport;
-import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleIoThread;
 import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport;
 
 public class BluetoothCommunicationService extends Service {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ServiceDeviceSupport.java
index 9603151b..f929274d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ServiceDeviceSupport.java
@@ -18,7 +18,7 @@ public class ServiceDeviceSupport implements DeviceSupport {
 
     private final DeviceSupport delegate;
     private long lastNoficationTime = 0;
-    private String lastNotificationType;
+    private String lastNotificationKind;
 
     public ServiceDeviceSupport(DeviceSupport delegate) {
         this.delegate = delegate;
@@ -79,11 +79,13 @@ public class ServiceDeviceSupport implements DeviceSupport {
     private boolean checkThrottle(String notificationKind) {
         long currentTime = System.currentTimeMillis();
         if ((currentTime - lastNoficationTime) < THROTTLING_THRESHOLD) {
-            if (notificationKind != null && notificationKind.equals(lastNotificationType)) {
+            if (notificationKind != null && notificationKind.equals(lastNotificationKind)) {
                 LOG.info("Ignoring " + notificationKind + " because of throttling threshold reached");
                 return true;
             }
         }
+        lastNoficationTime = currentTime;
+        lastNotificationKind = notificationKind;
         return false;
     }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java
index ecb2d066..1b305a7b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java
@@ -10,14 +10,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.net.URI;
+import java.text.DateFormat;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.UUID;
 
-import java.text.DateFormat;
-
 import nodomain.freeyourgadget.gadgetbridge.GBActivitySample;
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBCommand;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java
index 692b73f2..c868adc0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/PebbleSupport.java
@@ -2,8 +2,6 @@ package nodomain.freeyourgadget.gadgetbridge.pebble;
 
 import android.net.Uri;
 
-import java.net.URI;
-
 import nodomain.freeyourgadget.gadgetbridge.AbstractBTDeviceSupport;
 import nodomain.freeyourgadget.gadgetbridge.GBDeviceIoThread;
 import nodomain.freeyourgadget.gadgetbridge.protocol.GBDeviceProtocol;