diff --git a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
index c16a0c82afb7d14a51364f40bfce55950e7cef1d..78847e1e81e129718665917600e2417da7ece205 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/MainActivity.java
@@ -70,7 +70,6 @@ import info.nightscout.android.USB.UsbHidDriver;
 import info.nightscout.android.eula.Eula;
 import info.nightscout.android.eula.Eula.OnEulaAgreedTo;
 import info.nightscout.android.medtronic.service.MedtronicCnlAlarmManager;
-import info.nightscout.android.medtronic.service.MedtronicCnlAlarmReceiver;
 import info.nightscout.android.medtronic.service.MedtronicCnlIntentService;
 import info.nightscout.android.model.medtronicNg.PumpInfo;
 import info.nightscout.android.model.medtronicNg.PumpStatusEvent;
@@ -93,7 +92,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
 
     private int chartZoom = 3;
     private boolean hasZoomedChart = false;
-    private NumberFormat sgvFormatter;
 
     private boolean mEnableCgmService = true;
     private SharedPreferences prefs = null;
@@ -104,7 +102,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
     private Runnable mUiRefreshRunnable = new RefreshDisplayRunnable();
     private Realm mRealm;
     private StatusMessageReceiver statusMessageReceiver = new StatusMessageReceiver();
-    private MedtronicCnlAlarmReceiver medtronicCnlAlarmReceiver = new MedtronicCnlAlarmReceiver();
 
     /**
      * calculate the next poll timestamp based on last svg event
@@ -168,15 +165,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
         configurationStore.setMmolxl(prefs.getBoolean("mmolxl", false));
         configurationStore.setMmolxlDecimals(prefs.getBoolean("mmolDecimals", false));
 
-        if (configurationStore.isMmolxl()) {
-            if (configurationStore.isMmolxlDecimals())
-                sgvFormatter = new DecimalFormat("0.00");
-            else
-                sgvFormatter = new DecimalFormat("0.0");
-        } else {
-            sgvFormatter = new DecimalFormat("0");
-        }
-
         // Disable battery optimization to avoid missing values on 6.0+
         // taken from https://github.com/NightscoutFoundation/xDrip/blob/master/app/src/main/java/com/eveningoutpost/dexdrip/Home.java#L277L298
 
@@ -560,14 +548,6 @@ public class MainActivity extends AppCompatActivity implements OnSharedPreferenc
         } else if (key.equals("mmolxl") || key.equals("mmolDecimals")) {
             configurationStore.setMmolxl(sharedPreferences.getBoolean("mmolxl", false));
             configurationStore.setMmolxlDecimals(sharedPreferences.getBoolean("mmolDecimals", false));
-            if (configurationStore.isMmolxl()) {
-                if (configurationStore.isMmolxlDecimals())
-                    sgvFormatter = new DecimalFormat("0.00");
-                else
-                    sgvFormatter = new DecimalFormat("0.0");
-            } else {
-                sgvFormatter = new DecimalFormat("0");
-            }
             refreshDisplay();
         } else if (key.equals("pollInterval")) {
             configurationStore.setPollInterval(Long.parseLong(sharedPreferences.getString("pollInterval",
diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
index 358cc203123e64d456f05c97cd116eb33e3af9a2..b58d702ce647bf2c1014af714954c15107661788 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlAlarmManager.java
@@ -16,11 +16,10 @@ import info.nightscout.android.utils.ConfigurationStore;
  */
 public class MedtronicCnlAlarmManager {
     private static final String TAG = MedtronicCnlAlarmManager.class.getSimpleName();
-    private static final int ALARM_ID = 102; // Alarm id
+    private static final int ALARM_ID = 102;
 
     private static PendingIntent pendingIntent = null;
     private static AlarmManager alarmManager = null;
-    private static long nextAlarm = Long.MAX_VALUE;
 
     public static void setContext(Context context) {
         cancelAlarm();
@@ -30,11 +29,6 @@ public class MedtronicCnlAlarmManager {
         pendingIntent = PendingIntent.getBroadcast(context, ALARM_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
-    // Setting the alarm in 15 seconds from now
-    public static void setAlarm() {
-        setAlarm(System.currentTimeMillis());
-    }
-
     /**
      * set the alarm in the future
      *
@@ -44,7 +38,7 @@ public class MedtronicCnlAlarmManager {
         setAlarm(System.currentTimeMillis() + inFuture);
     }
 
-    // Setting the alarm to call onRecieve
+    // Setting the alarm to call onReceive
     public static void setAlarm(long millis) {
         if (alarmManager == null || pendingIntent == null)
             return;
@@ -56,21 +50,14 @@ public class MedtronicCnlAlarmManager {
         if (millis < now)
             millis = now;
 
-        // only accept alarm nearer than the last one
-        //if (nextAlarm < millis && nextAlarm > now) {
-        //    return;
-        //}
-
         cancelAlarm();
 
-        nextAlarm = millis;
-
         Log.d(TAG, "Alarm set to fire at " + new Date(millis));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             alarmManager.setAlarmClock(new AlarmManager.AlarmClockInfo(millis, null), pendingIntent);
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             // Android 5.0.0 + 5.0.1 (e.g. Galaxy S4) has a bug.
-            // Alarms are not exact. Fixed in 5.0.2 oder CM12
+            // Alarms are not exact. Fixed in 5.0.2 and CM12
             alarmManager.setExact(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
         } else {
             alarmManager.set(AlarmManager.RTC_WAKEUP, millis, pendingIntent);
diff --git a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
index 94e7cedc4c00876e6f53bc14b32d21751f1a4f5c..aa37aa1ccc3ee3158481528d6ea1b3b9c64391ce 100644
--- a/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
+++ b/app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java
@@ -39,7 +39,6 @@ import info.nightscout.android.utils.ConfigurationStore;
 import info.nightscout.android.utils.DataStore;
 import info.nightscout.android.xdrip_plus.XDripPlusUploadReceiver;
 import io.realm.Realm;
-import io.realm.RealmResults;
 
 public class MedtronicCnlIntentService extends IntentService {
     public final static int USB_VID = 0x1a79;