diff --git a/core/interfaces/src/main/res/values-ga-rIE/strings.xml b/core/interfaces/src/main/res/values-ga-rIE/strings.xml
deleted file mode 100644
index 917f62ed83..0000000000
--- a/core/interfaces/src/main/res/values-ga-rIE/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Maintenance -->
-    <!--    PumpType-->
-    <!-- PumpPluginBase -->
-    <!--    DecimalFormatter-->
-    <string name="format_insulin_units1">%1$.1f A</string>
-    <string name="format_insulin_units">%1$.2f A</string>
-</resources>
diff --git a/core/interfaces/src/main/res/values-ja-rJP/strings.xml b/core/interfaces/src/main/res/values-ja-rJP/strings.xml
deleted file mode 100644
index 7032179468..0000000000
--- a/core/interfaces/src/main/res/values-ja-rJP/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Maintenance -->
-    <!--    PumpType-->
-    <!-- PumpPluginBase -->
-    <!--    DecimalFormatter-->
-    <string name="format_insulin_units1">%1$.1f U</string>
-    <string name="format_insulin_units">%1$.2f U</string>
-</resources>
diff --git a/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.java b/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.java
deleted file mode 100644
index 768c7a47b7..0000000000
--- a/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package info.nightscout.core.pump.common.utils;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import info.nightscout.core.utils.DateTimeUtil;
-
-class DateTimeUtilUTest {
-
-    @Test
-    void getATechDateDifferenceAsMinutes() {
-
-        long dt1 = 20191001182301L;
-        long dt2 = 20191001192805L;
-
-        int aTechDateDifferenceAsMinutes = DateTimeUtil.getATechDateDifferenceAsMinutes(dt1, dt2);
-
-        Assertions.assertEquals(65, aTechDateDifferenceAsMinutes);
-
-        //Log.d("DateTimeUtilUTest", "Time difference: " + aTechDateDifferenceAsMinutes);
-
-    }
-}
\ No newline at end of file
diff --git a/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt b/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt
new file mode 100644
index 0000000000..8ba9e67eb7
--- /dev/null
+++ b/core/main/src/test/java/info/nightscout/core/pump/common/utils/DateTimeUtilUTest.kt
@@ -0,0 +1,15 @@
+package info.nightscout.core.pump.common.utils
+
+import info.nightscout.core.utils.DateTimeUtil
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Test
+
+internal class DateTimeUtilUTest {
+
+    @Test fun getaTechDateDifferenceAsMinutes() {
+        val dt1 = 20191001182301L
+        val dt2 = 20191001192805L
+        val aTechDateDifferenceAsMinutes = DateTimeUtil.getATechDateDifferenceAsMinutes(dt1, dt2)
+        Assertions.assertEquals(65, aTechDateDifferenceAsMinutes)
+    }
+}
\ No newline at end of file
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java
deleted file mode 100644
index 876ab1fad9..0000000000
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/BasalProfileStatus.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.pump.common.defs;
-
-/**
- * Created by andy on 1/20/19.
- */
-
-public enum BasalProfileStatus {
-
-    NotInitialized, //
-    ProfileOK, //
-    ProfileChanged, //
-
-}
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java
deleted file mode 100644
index 7125ec413e..0000000000
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package info.nightscout.pump.common.sync;
-
-import info.nightscout.interfaces.pump.defs.PumpType;
-
-public interface PumpSyncEntriesCreator {
-
-    long generateTempId(Object dataObject);
-
-    PumpType model();
-
-    String serialNumber();
-
-}
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt
new file mode 100644
index 0000000000..629a955c78
--- /dev/null
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncEntriesCreator.kt
@@ -0,0 +1,10 @@
+package info.nightscout.pump.common.sync
+
+import info.nightscout.interfaces.pump.defs.PumpType
+
+interface PumpSyncEntriesCreator {
+
+    fun generateTempId(objectA: Any): Long
+    fun model(): PumpType
+    fun serialNumber(): String
+}
\ No newline at end of file
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt
index db30c0fd56..5442213f9d 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/utils/ProfileUtil.kt
@@ -43,7 +43,7 @@ object ProfileUtil {
         // }
         // return if (stringBuilder.length > 3) stringBuilder.substring(0, stringBuilder.length - 2) else stringBuilder.toString()
 
-        var entriesCopy = profile.getBasalValues()
+        val entriesCopy = profile.getBasalValues()
 
         for (i in entriesCopy.indices) {
             val current = entriesCopy[i]