Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rfa58741ab8fbca9ad24e5f3929f41da510ee02ba -rcc3b00ea3b364c69d3c53829dde5d0671b76c664
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fa58741ab8fbca9ad24e5f3929f41da510ee02ba)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision cc3b00ea3b364c69d3c53829dde5d0671b76c664)
@@ -154,19 +154,6 @@
 }
 
 /*********************************************************************//**
-* @brief
-* The signalPreTreatmentTubeSetInstall function signals Pre-Treatment
-* to transition to the Tube Set Install flow.
-* @details \b Inputs: none
-* @details \b Outputs: tubeSetInstallRequested flag set to TRUE
-* @return none
-*************************************************************************/
-void signalPreTreatmentTubeSetInstall( void )
-{
-    tubeSetInstallRequested = TRUE;
-}
-
-/*********************************************************************//**
  * @brief
  * The handleSelfTestDryState function performs dry self-test.
  * @details Inputs: none
@@ -189,7 +176,7 @@
     if ( TRUE == tubeSetInstallRequested )
     {
         tubeSetInstallRequested = FALSE;
-        signalPreTreatmentTubeSetInstall();
+        //signalGoToInstallState();
     }
 
     if ( DRY_SELF_TESTS_COMPLETE_STATE == getDrySelfTestsState() )
Index: firmware/App/Modes/ModePreTreat.h
===================================================================
diff -u -rc8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab -rcc3b00ea3b364c69d3c53829dde5d0671b76c664
--- firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision c8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab)
+++ firmware/App/Modes/ModePreTreat.h	(.../ModePreTreat.h)	(revision cc3b00ea3b364c69d3c53829dde5d0671b76c664)
@@ -37,7 +37,6 @@
 U32  execPreTreatmentMode( void );                                  // Execute the pre-treatment mode state machine (call from OperationModes)
 
 TD_PRE_TREATMENT_MODE_STATE_T getPreTreatmentSubState( void );      // Get the current pre-treatment sub mode.
-void signalPreTreatmentTubeSetInstall( void );                      // Signal for pre-treatment tube set install
 
 /**@}*/
 
Index: firmware/App/Services/DrySelfTests.c
===================================================================
diff -u -rfa58741ab8fbca9ad24e5f3929f41da510ee02ba -rcc3b00ea3b364c69d3c53829dde5d0671b76c664
--- firmware/App/Services/DrySelfTests.c	(.../DrySelfTests.c)	(revision fa58741ab8fbca9ad24e5f3929f41da510ee02ba)
+++ firmware/App/Services/DrySelfTests.c	(.../DrySelfTests.c)	(revision cc3b00ea3b364c69d3c53829dde5d0671b76c664)
@@ -442,7 +442,7 @@
         {
             // If tube set is invalid it triggers an alarm
             activateAlarmNoData( ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET );
-            signalPreTreatmentTubeSetInstall();
+            //signalGoToInstallState();
         }
     }
 
@@ -475,7 +475,7 @@
         else
         {
             activateAlarmNoData( ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET );
-            signalPreTreatmentTubeSetInstall();
+            //signalGoToInstallState();PreTreatmentTubeSetInstall();
         }
     }
 
@@ -504,12 +504,12 @@
         if ( FALSE == authResponseValidTubeSet )
         {
             activateAlarmNoData( ALARM_ID_TD_INVALID_TUBE_SET );
-            signalPreTreatmentTubeSetInstall();
+            //signalGoToInstallState();PreTreatmentTubeSetInstall();
         }
         // Modality mismatch
         else if ( FALSE == authResponseModalityAccepted )
         {
-            signalPreTreatmentTubeSetInstall();
+            //signalGoToInstallState();PreTreatmentTubeSetInstall();
         }
         // If valid it goes to next state
         else