diff --git a/app/src/main/assets/OpenAPSAMA/round-basal.js b/app/src/main/assets/OpenAPSAMA/round-basal.js
deleted file mode 100644
index 39d286a53d..0000000000
--- a/app/src/main/assets/OpenAPSAMA/round-basal.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var endsWith = function endsWith(text, val) {
-	return text.indexOf(val, text.length - val.length) !== -1;
-}
-
-var round_basal = function round_basal(basal, profile) {
-
-    /* x23 and x54 pumps change basal increment depending on how much basal is being delivered:
-            0.025u for 0.025 < x < 0.975
-            0.05u for 1 < x < 9.95
-            0.1u for 10 < x
-      To round numbers nicely for the pump, use a scale factor of (1 / increment). */
-
-    var lowest_rate_scale = 20;
-
-    // Has profile even been passed in?
-    if (typeof profile !== 'undefined')
-    {
-        // Make sure optional model has been set
-        if (typeof profile.model == 'string')
-        {
-            if (endsWith(profile.model, "54") || endsWith(profile.model, "23"))
-            {
-                lowest_rate_scale = 40;
-            }
-        }
-    }
-
-    var rounded_result = basal;
-    // Shouldn't need to check against 0 as pumps can't deliver negative basal anyway?
-    if (basal < 1)
-    {
-        rounded_basal = Math.round(basal * lowest_rate_scale) / lowest_rate_scale;
-    }
-    else if (basal < 10)
-    {
-        rounded_basal = Math.round(basal * 20) / 20;
-    }
-    else
-    {
-        rounded_basal = Math.round(basal * 10) / 10;
-    }
-
-    return rounded_basal;
-}
-
-exports = module.exports = round_basal
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
index 925a97e98b..004d593f83 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java
@@ -139,8 +139,7 @@ public class DetermineBasalAdapterAMAJS {
     }
 
     private void loadScript() throws IOException {
-        mV8rt.executeVoidScript(readFile("OpenAPSAMA/round-basal.js"), "OpenAPSAMA/round-basal.js", 0);
-        mV8rt.executeVoidScript("var round_basal = module.exports;");
+        mV8rt.executeVoidScript("var round_basal = function round_basal(basal, profile) { return basal; };");
         mV8rt.executeVoidScript("require = function() {return round_basal;};");
 
         mV8rt.executeVoidScript(readFile("OpenAPSAMA/basal-set-temp.js"), "OpenAPSAMA/basal-set-temp.js ", 0);
@@ -151,15 +150,6 @@ public class DetermineBasalAdapterAMAJS {
                 "OpenAPSAMA/determine-basal.js",
                 0);
         mV8rt.executeVoidScript("var determine_basal = module.exports;");
-        mV8rt.executeVoidScript(
-                "var setTempBasal = function (rate, duration, profile, rT, offline) {" +
-                        "rT.duration = duration;\n" +
-                        "    rT.rate = rate;" +
-                        "return rT;" +
-                        "};",
-                "setTempBasal.js",
-                0
-        );
     }
 
     private void initModuleParent() {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
index ee877c8260..652ec856bd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalResultAMA.java
@@ -34,8 +34,8 @@ public class DetermineBasalResultAMA extends APSResult {
             duration = -1;
         } else {
             reason = result.getString("reason");
-            eventualBG = result.getDouble("eventualBG");
-            snoozeBG = result.getDouble("snoozeBG");
+            if (result.contains("eventualBG")) eventualBG = result.getDouble("eventualBG");
+            if (result.contains("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
             if (result.contains("rate")) {
                 rate = result.getDouble("rate");
                 if (rate < 0d) rate = 0d;