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