diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
index 8553f76596..c7d5acb769 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.kt
@@ -398,14 +398,6 @@ class CommandQueue @Inject constructor(
             callback?.result(PumpEnactResult(injector).success(true).enacted(false))?.run()
             return false
         }
-        /* this is breaking setting of profile at all if not engineering mode
-        if (!buildHelper.isEngineeringModeOrRelease()) {
-            val notification = Notification(Notification.NOT_ENG_MODE_OR_RELEASE, resourceHelper.gs(R.string.not_eng_mode_or_release), Notification.URGENT)
-            rxBus.send(EventNewNotification(notification))
-            callback?.result(PumpEnactResult(injector).success(false).enacted(false).comment(R.string.not_eng_mode_or_release)))?.run()
-            return false
-        }
-        */
         // Compare with pump limits
         val basalValues = profile.getBasalValues()
         for (basalValue in basalValues) {
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
index ceaae53fe5..3f3248ea40 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/general/overview/notifications/Notification.kt
@@ -84,9 +84,6 @@ open class Notification {
         const val UNSUPPORTED_FIRMWARE = 28
         const val MINIMAL_BASAL_VALUE_REPLACED = 29
         const val BASAL_PROFILE_NOT_ALIGNED_TO_HOURS = 30
-        const val ZERO_VALUE_IN_PROFILE = 31
-        const val PROFILE_SWITCH_MISSING = 32
-        @Suppress("unused") const val NOT_ENG_MODE_OR_RELEASE = 33
         const val WRONG_PUMP_PASSWORD = 34
         const val PERMISSION_STORAGE = 35
         const val PERMISSION_LOCATION = 36