diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
index 9dc8c04a35..e3c77d0122 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
@@ -13,7 +13,6 @@ import android.content.SharedPreferences;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
 
-import org.mozilla.javascript.ast.Loop;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,78 +20,39 @@ import java.util.Date;
 
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.data.Profile;
-import info.nightscout.androidaps.db.BgReading;
-import info.nightscout.androidaps.db.DatabaseHelper;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
-import info.nightscout.androidaps.plugins.Overview.Notification;
-import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
-import info.nightscout.utils.SP;
+import info.nightscout.androidaps.data.Profile;
 
 public class KeepAliveReceiver extends BroadcastReceiver {
-    public static final long STATUS_UPDATE_FREQUENCY = 15 * 60 * 1000L;
     private static Logger log = LoggerFactory.getLogger(KeepAliveReceiver.class);
 
-    // TODO consider moving this into an Alarms plugin that works offline and can be configured
-    // (e.g. override silent mode at night only)
-    public static final int ALARM_FREQUENCY = 25 * 60 * 1000;
-    private static long nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
-    private static long nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
-
     @Override
     public void onReceive(Context context, Intent rIntent) {
         PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "");
         wl.acquire();
 
-        checkBg();
-        checkPump();
 
-        log.debug("KeepAlive received");
-        wl.release();
-    }
-
-    private void checkBg() {
-        BgReading bgReading = DatabaseHelper.lastBg();
-        if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
-        && bgReading != null && bgReading.date + ALARM_FREQUENCY < System.currentTimeMillis()
-                && nextMissedReadingsAlarm < System.currentTimeMillis()) {
-            Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
-            n.soundId = R.raw.alarm;
-            nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
-            MainApp.bus().post(new EventNewNotification(n));
-        }
-    }
-
-    private void checkPump() {
         final PumpInterface pump = MainApp.getConfigBuilder();
         final Profile profile = MainApp.getConfigBuilder().getProfile();
-        // TODO suspended?
-        if (pump != null && profile != null && profile.getBasal() != null && !LoopPlugin.getPlugin().isSuspended()) {
+        if (pump != null && profile != null && profile.getBasal() != null) {
+            boolean isBasalOutdated = false;
+            boolean isStatusOutdated = false;
+
             Date lastConnection = pump.lastDataTime();
-
-            boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis();
-            boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
-
-            boolean alarmTimeoutExpired = lastConnection.getTime() + ALARM_FREQUENCY < System.currentTimeMillis();
-            boolean nextAlarmOccurrenceReached = nextPumpDisconnectedAlarm < System.currentTimeMillis();
+            if (lastConnection.getTime() + 30 * 60 * 1000L < System.currentTimeMillis())
+                isStatusOutdated = true;
+            if (Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep)
+                isBasalOutdated = true;
 
             SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
-            if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_pump_unreachable_alert), false)
-                    && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached) {
-                Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
-                n.soundId = R.raw.alarm;
-                nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY;
-                MainApp.bus().post(new EventNewNotification(n));
-            } else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
+            if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
                 Thread t = new Thread(new Runnable() {
                     @Override
                     public void run() {
                         pump.setNewBasalProfile(profile);
                     }
-                }, "pump-update-basal-profile");
+                });
                 t.start();
             } else if (isStatusOutdated && !pump.isBusy()) {
                 Thread t = new Thread(new Runnable() {
@@ -100,7 +60,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                     public void run() {
                         pump.refreshDataFromPump("KeepAlive. Status outdated.");
                     }
-                }, "pump-refresh");
+                });
                 t.start();
             } else if (isBasalOutdated && !pump.isBusy()) {
                 Thread t = new Thread(new Runnable() {
@@ -108,10 +68,13 @@ public class KeepAliveReceiver extends BroadcastReceiver {
                     public void run() {
                         pump.refreshDataFromPump("KeepAlive. Basal outdated.");
                     }
-                }, "pump-refresh");
+                });
                 t.start();
             }
         }
+
+        log.debug("KeepAlive received");
+        wl.release();
     }
 
     public void setAlarm(Context context) {