Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r2511d0de0eca7120f6c2241e0938993a460203b1 -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
@@ -140,7 +140,6 @@
 
     //TODO:remove once level sensor working
     bicarbChamberPeriodicFillCounter            = 0;
-
  }
 
 /*********************************************************************//**
@@ -1108,7 +1107,6 @@
  * chamber switching only without dosing delivery  and pressure check condition.
  * @details \b Inputs: tester logged in
  * @details \b Outputs: tdDialysateFlowrate,balanceChamberSwitchingOnly
- * pendingBalanceChamberSwOnlyRequest
  * @param message set message from Dialin which includes the balancing chamber
  * to start/stop switching and update switching rate based on the flow rate.
  * @return TRUE if set request is successful, FALSE if not
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r2511d0de0eca7120f6c2241e0938993a460203b1 -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
@@ -216,7 +216,6 @@
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
-
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
@@ -47,7 +47,6 @@
 static DD_STANDBY_MODE_STATE_T standbyState;                                              ///< Currently active standby state.
 
 static BOOL pendingStartDDPreGenRequest;                                                  ///< Flag indicating TD has requested DD start the pre generation dialysate request.
-static BOOL pendingBalanceChamberSwOnlyRequest;                                           ///< Flag indicating balancing chamber switch only request.
 //static BOOL pendingStartDDFlushRequest;                                                 ///< Flag indicating TD has requested DD start flush.
 //static BOOL pendingStartDDHeatDisinfectRequest;                                         ///< Flag indicating TD has requested DD start heat disinfect.
 //static BOOL pendingStartDDHeatDisinfectActiveCoolRequest;                               ///< Flag indicating TD has requested DD start heat disinfect active cool.
@@ -69,7 +68,6 @@
 {
     standbyState                                 = DD_STANDBY_MODE_STATE_IDLE;
     pendingStartDDPreGenRequest                  = FALSE;
-    pendingBalanceChamberSwOnlyRequest           = FALSE;
 //    pendingStartDDFlushRequest                   = FALSE;
 //    pendingStartDDHeatDisinfectRequest           = FALSE;
 //    pendingStartDDHeatDisinfectActiveCoolRequest = FALSE;
@@ -250,7 +248,7 @@
  * The requestBCSwitchingOnlyStart function handles Balancing chamber switching
  * only start request.
  * @details \b Inputs: standbyState
- * @details \b Outputs: pendingBalanceChamberSwOnlyRequest
+ * @details \b Outputs: none
  * @return TRUE if request accepted, FALSE if not.
  *************************************************************************/
 BOOL requestBCSwitchingOnlyStart( void )
@@ -260,7 +258,6 @@
     if ( DD_STANDBY_MODE_STATE_IDLE == standbyState )
     {
         result                             = TRUE;
-        pendingBalanceChamberSwOnlyRequest = TRUE;
 
         // Activate Balancing Chamber Switching
         requestBalChamberSwitching( TRUE );
@@ -274,13 +271,11 @@
  * The requestBCSwitchingOnlyStop function handles Balancing chamber switching
  * only stop request.
  * @details \b Inputs: standbyState
- * @details \b Outputs: pendingBalanceChamberSwOnlyRequest
+ * @details \b Outputs: none
  * @return none.
  *************************************************************************/
 void requestBCSwitchingOnlyStop( void )
 {
-    pendingBalanceChamberSwOnlyRequest = FALSE;
-
     // Deactivate Balancing Chamber Switching
     requestBalChamberSwitching( FALSE );