Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r31e778e30a996a0c75429c9a1e9fb34e5d9e373d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 31e778e30a996a0c75429c9a1e9fb34e5d9e373d)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -415,7 +415,7 @@
         else
         {
 #ifndef IGNORE_BLOOD_LEAK_ALARM
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
                 activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_SET_POINT_SET_FAILURE );
             }
@@ -525,7 +525,7 @@
         if ( TRUE == didTimeout( bloodLeakZeroStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
 #ifndef IGNORE_BLOOD_LEAK_ALARM
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
                 activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_FAULT );
             }
@@ -605,7 +605,7 @@
         {
             bloodLeakPersistenceCtr = BLOOD_LEAK_PERSISTENCE;
 #ifndef IGNORE_BLOOD_LEAK_ALARM
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
                 activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_DETECTED );
             }
@@ -621,7 +621,7 @@
         else
         {
 #ifndef IGNORE_BLOOD_LEAK_ALARM
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
                 clearAlarmCondition( ALARM_ID_HD_BLOOD_LEAK_DETECTED );
             }
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -77,7 +77,7 @@
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
 #ifdef SKIP_UI_INTERACTION
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
             {
                 consumableInstallConfirmed = TRUE;
             }
@@ -87,7 +87,7 @@
             {
                 consumableInstallConfirmed = FALSE;
 #ifndef SKIP_CONSUMABLE_TESTS
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+                //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
                 {
                     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
                 }
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -367,7 +367,7 @@
     if ( STATE_CLOSED == getFPGADoorState() )
     {
 #ifdef SKIP_UI_INTERACTION
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
         {
             patientDisconnectionConfirmed = TRUE;
         }
@@ -413,7 +413,7 @@
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         disposableRemovalConfirmed = TRUE;
     }
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rdc857e4edb58df50f07bf3509e418a3b892586ae -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision dc857e4edb58df50f07bf3509e418a3b892586ae)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -199,7 +199,7 @@
     {
         case HD_PRE_TREATMENT_START_STATE:
 #ifndef SKIP_SAMPLE_WATER
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
             {
                 transitionToSampleWater();
             }
@@ -357,7 +357,7 @@
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         patientConnectionConfirm = TRUE;
     }
@@ -654,7 +654,7 @@
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         confirmInstallRequested = TRUE;
     }
@@ -773,7 +773,7 @@
     execPreTreatmentRecirc();
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         continueToTreatmentRequested = TRUE;
     }
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -424,7 +424,7 @@
     primeStartTime = getMSTimerCount();
 
 #ifdef SKIP_UI_INTERACTION
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
     {
         primeStartRequested = TRUE;
     }
Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -130,7 +130,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
 
 #ifdef SKIP_SAMPLE_WATER
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
+    //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
     {
         sampleWaterResult = TRUE;
     }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r31e778e30a996a0c75429c9a1e9fb34e5d9e373d -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 31e778e30a996a0c75429c9a1e9fb34e5d9e373d)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -379,12 +379,12 @@
     {
         case DRY_SELF_TESTS_START_STATE:
 #ifdef SKIP_DRY_SELF_TESTS
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
             {
                 // TODO: Remove once dry self-test is ready to use
                 currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
             }
-            else
+#else
             {
                 currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
             }
@@ -1037,11 +1037,11 @@
     {
         selfTestsResumeRequested = FALSE;
 #ifndef SKIP_DRY_SELF_TESTS
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
             state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
         }
-        else
+#else
         {
             state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
@@ -1183,7 +1183,7 @@
     {
 
 #ifndef IGNORE_BLOOD_LEAK_SELF_TEST
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
+        //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE )
         {
             zeroBloodLeak();
         }
@@ -1214,7 +1214,7 @@
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
 #ifndef IGNORE_BLOOD_LEAK_SELF_TEST
-    if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) ||
+    if ( /*( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) || */
          ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) )
 #endif
     {