Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3f0d1433b3481160bf554aaf7371708380211a36 -r4e8a27d276ec5abfd96a6730ec6d78a821b57576
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3f0d1433b3481160bf554aaf7371708380211a36)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4e8a27d276ec5abfd96a6730ec6d78a821b57576)
@@ -52,35 +52,16 @@
 
 // ********** private data **********
 
-//static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;              ///< Current Pre-Treatment sub-state
-//static BOOL goToInstallStateRequested;                                      ///< Flag indicating a request to transition to Install state.
-//static BOOL alarmActionResumeReceived;                                      ///< Flag indicates alarm action resume received.
-//static BOOL tubeSetInstallRequested;                                        ///< Request to re-enter install flow (mid-treatment / failure)
-//static U32  submodeCompleteTransitionTimeCounter;                           ///< Sub-mode completed transition wait time counter.
-//static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Patient Connection state.
-//static BOOL treatmentStartRequested;                                        ///< Flag indicating the UI requested treatment start.
-//static U32 preTreatmentStateBroadcastTimerCtr;                              ///< Pre-Treatment state data broadcast timer counter.
-//static OVERRIDE_U32_T preTreatmentStatePublishInterval;                     ///< Pre-Treatment state data publication interval override.
-//
-//static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;              ///< Current Pre-Treatment sub-state
-//static BOOL goToInstallStateRequested;                                      ///< Flag indicating a request to transition to Install state.
-//static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Confirm Rx state.
-//static BOOL continueFromHeparinSetupRequested;                              ///< Flag indicating a request to transition to Patient Connection state.
-//static BOOL treatmentStartRequested;                                        ///< Flag indicating the UI requested treatment start.
-//static U32 preTreatmentStateBroadcastTimerCtr;                              ///< Pre-Treatment state data broadcast timer counter.
-//static OVERRIDE_U32_T preTreatmentStatePublishInterval;                     ///< Pre-Treatment state data publication interval override.
+static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;              ///< Current Pre-Treatment sub-state
+static BOOL goToInstallStateRequested;                                      ///< Flag indicating a request to transition to Install state.
+static BOOL alarmActionResumeReceived;                                      ///< Flag indicates alarm action resume received.
+static U32  submodeCompleteTransitionTimeCounter;                           ///< Sub-mode completed transition wait time counter.
+static BOOL continueFromRecirculateRequested;                               ///< Flag indicating a request to transition to Patient Connection state.
+static BOOL continueFromHeparinSetupRequested;                              ///< Flag indicating a request to transition to Patient Connection state.
+static BOOL treatmentStartRequested;                                        ///< Flag indicating the UI requested treatment start.
+static U32 preTreatmentStateBroadcastTimerCtr;                              ///< Pre-Treatment state data broadcast timer counter.
+static OVERRIDE_U32_T preTreatmentStatePublishInterval;                     ///< Pre-Treatment state data publication interval override.
 
-static TD_PRE_TREATMENT_MODE_STATE_T currentPreTreatmentState;
-static BOOL goToInstallStateRequested;
-static BOOL alarmActionResumeReceived;
-static U32 submodeCompleteTransitionTimeCounter;
-static BOOL continueFromRecirculateRequested;
-static BOOL continueFromHeparinSetupRequested;
-static BOOL treatmentStartRequested;
-static U32 preTreatmentStateBroadcastTimerCtr;
-static OVERRIDE_U32_T preTreatmentStatePublishInterval;
-
-
 // ********** private function prototypes **********
 
 static void setPreTreatStateTransition( void );                                 ///< Configure actuators and variables for Pre-Treatment state transitions.
@@ -123,36 +104,6 @@
     initDrySelfTests();
 }
 
-
-//void initPreTreatmentMode( void )
-//{
-//    // Start a fresh Treatment Parameters session for this run.
-//    initTreatmentParameters();
-//    currentPreTreatmentState           = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
-//    goToInstallStateRequested          = FALSE;
-//    continueFromRecirculateRequested   = FALSE;
-//    treatmentStartRequested            = FALSE;
-//    initPreTxHeparinSetup();
-//    initDrySelfTests();
-//
-//    currentPreTreatmentState  = TD_PRE_TREATMENT_TUBING_SET_INSTALL_STATE;
-//    goToInstallStateRequested = FALSE;
-//    continueFromRecirculateRequested = FALSE;
-//    continueFromHeparinSetupRequested = FALSE;
-//    treatmentStartRequested = FALSE;
-//    preTreatmentStateBroadcastTimerCtr = PRE_TREATMENT_STATE_DATA_PUB_INITIAL_OFFSET;
-//    alarmActionResumeReceived = FALSE;
-//    submodeCompleteTransitionTimeCounter = 0;
-//
-//    preTreatmentStatePublishInterval = (OVERRIDE_U32_T)
-//    {
-//        PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
-//        PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
-//        PRE_TREATMENT_STATE_DATA_PUB_INTERVAL,
-//        0
-//    };
-//}
-
 /*********************************************************************//**
 * @brief
 * The transitionToPreTreatmentMode function prepares the system for