Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -ra70cb02cb99d80ea585e44824964857a372075f9 -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a70cb02cb99d80ea585e44824964857a372075f9)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -23,7 +23,6 @@
 #include "Messaging.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
-#include "PinchValve.h"
 #include "StatePreTxRecirculate.h"
 #include "SyringePump.h"
 #include "TaskGeneral.h"
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r638b779e225a66a1fecac6ea8679ca9c0f31f537 -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 638b779e225a66a1fecac6ea8679ca9c0f31f537)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -24,14 +24,13 @@
 #include "ModeTreatment.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
-#include "PinchValve.h"
 #include "Switches.h"
+#include "SyringePump.h"
 #include "SystemCommTD.h"
 #include "TxParams.h"
 #include "Valve3Way.h"
 #include "Valves.h"
 
-
 /**
  *  @addtogroup TDStandbyMode
  *  @{
@@ -50,7 +49,6 @@
 static FLUID_TYPE_T fluidType;                                                                 ///< Fluid type assigned based on user selection.
 static TREATMENT_TYPE_T modality;                                                              ///< Modality from the treatment initiation.
 
-
 // ********** private function prototypes **********
 
 static TD_STANDBY_STATE_T handleStandbyModeStartState( void );
@@ -209,6 +207,7 @@
 
     return state;
 }
+
 /*********************************************************************//**
  * @brief
  * The handleStandbyModeWaitForTreatmentState function handles wait for
@@ -223,7 +222,6 @@
     DD_OP_MODE_T ddOperationMode = getDDOpMode();
     F32 bicarbConvFactor         = BICARBONATE_CONVERSION_FACTOR;
 
-
 //    switch ( dgOperationMode )
 //    {
 //        case DG_MODE_GENE:
@@ -291,7 +289,6 @@
     return state;
 }
 
-
 /*********************************************************************//**
  * @brief
  * The setFluidType function sets the fluid type based on the user's
Index: firmware/App/Modes/StateTxPaused.c
===================================================================
diff -u -r7166df604166f74ff5eb8667e07947d52ac39cf2 -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 7166df604166f74ff5eb8667e07947d52ac39cf2)
+++ firmware/App/Modes/StateTxPaused.c	(.../StateTxPaused.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -26,6 +26,7 @@
 #include "ModeTreatment.h"
 //#include "NVDataMgmt.h"
 #include "OperationModes.h"
+#include "Pressures.h"
 #include "StateTxPaused.h"
 #include "Switches.h"
 #include "TaskGeneral.h"
@@ -112,7 +113,7 @@
     transitionToTxPausedState( currentTxPausedState );
 
     // TODO figure out the code
-//    signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
+    signalInitiatePressureStabilization( USE_NORMAL_STABILIZATION_PERIOD );
 
     // Reset blood leak zeroing params
 //    resetBloodLeakZeroingVariables();
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r7166df604166f74ff5eb8667e07947d52ac39cf2 -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 7166df604166f74ff5eb8667e07947d52ac39cf2)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -169,9 +169,6 @@
     { MSG_ID_TD_AIR_TRAP_LEVEL_RAW_OVERRIDE_REQUEST,                    &testRawLevelSensorOverride },
     { MSG_ID_TD_AIR_TRAP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,             &testAirTrapDataPublishIntervalOverride },
     { MSG_ID_TD_3_WAY_VALVE_SET_STATE_REQUEST,                          &testSet3WayValve },
-    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_SET_POS_REQUEST,                     &testSetValve },
-    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_STATUS_OVERRIDE_REQUEST,             &testValveStatusOverride },
-    //{ MSG_ID_TD_ROTARY_PINCH_VALVE_POSITION_OVERRIDE_REQUEST,           &testValveEncoderPositionOverride },
     { MSG_ID_TD_VALVES_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testValvesDataPublishIntervalOverride },
     { MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST,                       &testValveSetABCCmdPosition },
     { MSG_ID_TD_PINCH_VALVE_HOME_REQUEST,                               &testHomeValve },
Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -rde6b47e92a4bffac2ae7238aba9d522bda3ae4df -r4a5a809459e76f558dce420dedf20f3de5b4a7a1
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision de6b47e92a4bffac2ae7238aba9d522bda3ae4df)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 4a5a809459e76f558dce420dedf20f3de5b4a7a1)
@@ -352,7 +352,6 @@
     }
 
     return result;
-
 }
 
 /*********************************************************************//**