diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index c2729f83..5ce26a5a 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -74,14 +74,6 @@ function getMachineNames (config) {
       const mergeByDeviceId = (x, y) => _.values(_.merge(_.keyBy('deviceId', x), _.keyBy('deviceId', y)))
       const machines = mergeByDeviceId(mergeByDeviceId(rawMachines, heartbeat), performance)
 
-      const getStatus = (ping, stuck) => {
-        if (ping && ping.age) return unresponsiveStatus
-
-        if (stuck && stuck.age) return stuckStatus
-
-        return fullyFunctionalStatus
-      }
-
       const addName = r => {
         const cashOutConfig = configManager.getCashOut(r.deviceId, config)
 
diff --git a/lib/plugins.js b/lib/plugins.js
index a8dad677..89ad79c9 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -616,6 +616,7 @@ function plugins (settings, deviceId) {
     const denomination1 = cashOutConfig.top
     const denomination2 = cashOutConfig.bottom
     const cashOutEnabled = cashOutConfig.active
+    const isCassetteLow = (have, max, limit) => cashOutEnabled && ((have / max) * 100) < limit
 
     const notifications = configManager.getNotifications(null, device.deviceId, settings.config)
 
@@ -630,7 +631,7 @@ function plugins (settings, deviceId) {
       }
       : null
 
-    const cassette1Alert = cashOutEnabled && (device.cassette1 / cassetteMaxCapacity) < notifications.fillingPercentageCassette1
+    const cassette1Alert = isCassetteLow(device.cassette1, cassetteMaxCapacity, notifications.fillingPercentageCassette1)
       ? {
         code: 'LOW_CASH_OUT',
         cassette: 1,
@@ -642,7 +643,7 @@ function plugins (settings, deviceId) {
       }
       : null
 
-    const cassette2Alert = cashOutEnabled && (device.cassette2 / cassetteMaxCapacity) < notifications.fillingPercentageCassette2
+    const cassette2Alert = isCassetteLow(device.cassette2, cassetteMaxCapacity, notifications.fillingPercentageCassette2)
       ? {
         code: 'LOW_CASH_OUT',
         cassette: 2,