Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -8,7 +8,7 @@
 * @file ModePostTreat.c
 *
 * @author (last) Sean Nash
-* @date (last) 28-Aug-2020
+* @date (last) 08-Oct-2020
 *
 * @author (original) Dara Navaei
 * @date (original) 05-Nov-2019
@@ -39,9 +39,8 @@
 /*********************************************************************//**
  * @brief
  * The initPostTreatmentMode function initializes the Post-Treatment Mode module.
- * @details
- * Inputs : none
- * Outputs : Post-Treatment Mode module initialized.
+ * @details Inputs: none
+ * @details Outputs: Post-Treatment Mode module initialized.
  * @return none
  *************************************************************************/
 void initPostTreatmentMode( void )
@@ -52,25 +51,12 @@
  * @brief
  * The transitionToPostTreatmentMode function prepares for transition to
  * post-treatment mode.
- * @details
- * Inputs : none
- * Outputs : none
+ * @details Inputs: none
+ * @details Outputs: none
  * @return none
  *************************************************************************/
 void transitionToPostTreatmentMode( void )
 {
-    // temporary test code.  TODO - remove later
-#ifndef UF_TEST_ENABLED
-#ifndef RUN_PUMPS_OPEN_LOOP
-    setBloodPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    setDialInPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_CLOSED_LOOP );
-#else
-    setBloodPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#endif
-    setDialOutPumpTargetRate( 100, MOTOR_DIR_REVERSE, PUMP_CONTROL_MODE_OPEN_LOOP );
-#else
-#endif
 #ifdef RM46_EVAL_BOARD_TARGET
     start = getMSTimerCount();
 #endif
@@ -79,16 +65,15 @@
 /*********************************************************************//**
  * @brief
  * The execFaultMode function executes the Post-Treatment Mode state machine.
- * @details
- * Inputs : none
- * Outputs : none
+ * @details Inputs: none
+ * @details Outputs: none
  * @return current state (sub-mode)
  *************************************************************************/
 U32 execPostTreatmentMode( void )
 {
     BOOL stop = isStopButtonPressed();
 
-#ifndef UF_TEST_ENABLED
+#ifdef DISABLE_UI_TREATMENT_WORKFLOW
     if ( TRUE == stop )
 #endif
     {