Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r9e85e7ace1390d48587174a5bc6eb11d5185cea4 -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 9e85e7ace1390d48587174a5bc6eb11d5185cea4)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -76,9 +76,7 @@
     switch( currentConsumableSelfTestState )
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
-#ifdef SKIP_UI_INTERACTION
-            consumableInstallConfirmed = TRUE;
-#endif
+
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
             {
                 consumableInstallConfirmed = TRUE;
@@ -87,11 +85,6 @@
             if ( TRUE == consumableInstallConfirmed )
             {
                 consumableInstallConfirmed = FALSE;
-#ifndef SKIP_CONSUMABLE_TESTS
-                //currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
-#else
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#endif
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
                 {
                     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;