diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
index 9800a8dd80..e5d3b68b0e 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWDefinition.java
@@ -62,9 +62,6 @@ public class SWDefinition {
 
 
     SWDefinition() {
-        // Don't allow for screens to add up
-        if(screens.size() >0)
-            screens = new ArrayList<>();
         // List all the screens here
         add(new SWScreen(R.string.nav_setupwizard)
                 .add(new SWInfotext()
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWRadioButton.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWRadioButton.java
index b40922dd21..7cdbee3d71 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SWRadioButton.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SWRadioButton.java
@@ -64,4 +64,4 @@ public class SWRadioButton extends SWItem {
         layout.addView(radioGroup);
         super.generateDialog(view, layout);
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
index b905487118..67af63326b 100644
--- a/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/startupwizard/SetupWizardActivity.java
@@ -38,6 +38,7 @@ public class SetupWizardActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         LocaleHelper.onCreate(this, "en");
         setContentView(R.layout.activity_setupwizard);
+
         Intent intent = getIntent();
         currentWizardPage = intent.getIntExtra(SetupWizardActivity.INTENT_MESSAGE, 0);
         if (screens.size() > 0 && currentWizardPage < screens.size()) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a9cd09105..bae0a5698f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1022,7 +1022,6 @@
     <string name="setupwizard_skip">Skip</string>
     <string name="setupwizard_finish">FINISH</string>
     <string name="setupwizard_language_prompt">Select your language</string>
-    <string name="setupwizard_pump_test">Test pump connection</string>
     <string name="key_language" translatable="false">language</string>
     <string name="key_openapsama_min_5m_carbimpact" translatable="false">openapsama_min_5m_carbimpact</string>
     <string name="boluserrorcode">Asked: %.2fU Delivered: %.2fU Error code: %d</string>
@@ -1061,9 +1060,6 @@
     <string name="wear_wizard_settings_summary">Calculations included in the Wizard result:</string>
     <string name="wear_display_settings">Display Settings</string>
     <string name="wear_general_settings">General Settings</string>
-    <string name="dummy_content">DUMMY\nCONTENT</string>
-    <string name="nsclient_prefs">Additional NSClient options</string>
-    <string name="settings_incorrect">Incorrect settings! Press \'BACK\' and try again</string>
     <string name="enable_nsclient">Enable NSClient</string>
     <string name="welcometosetupwizard">Welcome to setup wizard. It will guide you through the setup process</string>
     <string name="pumpsetup">Pump setup</string>