diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.kt
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDeviceState.kt
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpDriverState.kt
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpHistoryEntryGroup.kt
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
similarity index 100%
rename from medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpStatusType.kt
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/TempBasalPair.kt
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ByteUtil.java
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ProfileUtil.java
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/StringUtil.java
diff --git a/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
similarity index 100%
rename from rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
rename to core/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/ThreadUtil.java
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
index c9d4009bf7..6e1130f3d8 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@@ -12,7 +12,6 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.events.EventExtendedBolusChange
 import info.nightscout.androidaps.events.EventPumpStatusChanged
 import info.nightscout.androidaps.events.EventTempBasalChange
-import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.PumpSync
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
index 281f315614..e97ca2d329 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt
@@ -10,7 +10,6 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.activities.ErrorHelperActivity.Companion.runAlarm
 import info.nightscout.androidaps.data.DetailedBolusInfo
 import info.nightscout.androidaps.data.PumpEnactResult
-import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.interfaces.PumpSync.TemporaryBasalType
@@ -35,7 +34,6 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ResetRileyLinkConfigurationTask
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.ServiceTaskExecutor
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.WakeAndTuneTask
-import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntry
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpDbEntryTBR
 import info.nightscout.androidaps.plugins.pump.common.sync.PumpSyncEntriesCreator
 import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil
@@ -47,7 +45,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfile.Companion.getProfilesByHourToString
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.BasalProfileEntry
 import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalPair
-import info.nightscout.androidaps.plugins.pump.medtronic.data.dto.TempBasalProcessDTO
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.*
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicCommandType.Companion.getSettings
 import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpStatus
diff --git a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
index c1e08c7f18..ca5add4bbc 100644
--- a/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
+++ b/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt
@@ -12,13 +12,10 @@ import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.DaggerActivity
-import dagger.android.DispatchingAndroidInjector
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup
-import info.nightscout.androidaps.plugins.pump.common.defs.PumpHistoryEntryGroup.Companion.getTranslatedList
 import info.nightscout.androidaps.plugins.pump.medtronic.R
 import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.pump.PumpHistoryEntry
 import info.nightscout.androidaps.plugins.pump.medtronic.data.MedtronicHistoryData
-import info.nightscout.androidaps.plugins.pump.medtronic.databinding.MedtronicHistoryActivityBinding
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject