Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rce9145f506c3b7b970285bf2ab2e464b66f83bab -rea668c42924e251378d886d2ef1f74bddb1f8456
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ce9145f506c3b7b970285bf2ab2e464b66f83bab)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ea668c42924e251378d886d2ef1f74bddb1f8456)
@@ -116,18 +116,7 @@
     // Execute mode state machine
     switch ( currentPreTreatmentState )
     {
-        case TD_PRE_TREATMENT_WATER_SAMPLE_STATE:
-            // currentPreTreatmentState = handleWaterSampleState();
-            break;
 
-        case TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE:
-            // currentPreTreatmentState = handleSelfTestConsumableState();
-            break;
-
-        case TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE:
-            // currentPreTreatmentState = handleSelfTestNoCartState();
-            break;
-
         case TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE:
             currentPreTreatmentState = handleInstallState();
             break;
@@ -214,60 +203,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleWaterSampleState function executes the Water Sample state of
- * pre-treatment mode.
- * @details \b Inputs: TODO fill up if any
- * @details \b Outputs: TODO fill up if any
- * @return next Pre-Treatment mode state.
- *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void )
-{
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_WATER_SAMPLE_STATE;
-
-    // TODO: Transition to Self test consumable state on completion when implemented
-    // state = TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSelfTestConsumableState function executes the Self Test
- * Consumable state of pre-treatment mode.
- * @details \b Inputs: TODO fill up if any
- * @details \b Outputs: TODO fill up if any
- * @return next Pre-Treatment mode state.
- *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestConsumableState( void )
-{
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-
-    // TODO: Transition to Self test no cart state on completion when implemented
-    // state = TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleSelfTestNoCartState function executes the Self Test No Cart
- * state of pre-treatment mode.
- * @details \b Inputs: TODO fill up if any
- * @details \b Outputs: TODO fill up if any
- * @return next Pre-Treatment mode state.
- *************************************************************************/
-static TD_PRE_TREATMENT_MODE_STATE_T handleSelfTestNoCartState( void )
-{
-    TD_PRE_TREATMENT_MODE_STATE_T state = TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE;
-
-    // TODO: Transition to Tubing set install state on completion when implemented
-    // state = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
-
-    return state;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleInstallState function calls Tube Set Install Service and
  * advances to Self Test Dry state once the service signals
  * completion.