Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3b13577b894c0299e36c2a7f294db8689a28d157 -r4e4ab946c0bc4b668cf5b197c7f841355814ccf5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3b13577b894c0299e36c2a7f294db8689a28d157)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 4e4ab946c0bc4b668cf5b197c7f841355814ccf5)
@@ -37,9 +37,6 @@
 #include "TaskGeneral.h"
 #include "Timers.h"
 #include "Valves.h"
-#ifdef EMC_TEST_BUILD     // TODO - test code
-#include "FPGA.h"
-#endif
 
 /**
  *  @addtogroup HDStandbyMode
@@ -153,10 +150,6 @@
  *************************************************************************/
 U32 execStandbyMode( void )
 {
-#ifdef EMC_TEST_BUILD
-    static U32 toggle = 0;
-    static BOOL button_state = FALSE;
-#endif
     BOOL stop = isStopButtonPressed();
 
 #ifndef RUN_WITHOUT_DG
@@ -226,13 +219,6 @@
             homeBloodPump();
             homeDialInPump();
             homeDialOutPump();
-#ifdef EMC_TEST_BUILD
-            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-            startAirTrapControl();
-#endif
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
@@ -241,63 +227,6 @@
                 requestNewOperationMode( MODE_TPAR );
                 treatStartReqReceived = FALSE;
             }
-            // TODO - test code
-            if ( TRUE == stop )
-            {
-#ifndef EMC_TEST_BUILD
-                treatStartReqReceived = FALSE;
-                setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-                setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-                setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-                setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-                requestNewOperationMode( MODE_TPAR );
-#else
-                if ( stop != button_state )
-                {
-                    toggle = INC_WRAP( toggle, 0, 3 );
-                    switch ( toggle )
-                    {
-                        case 0: // Pumps and valves off
-                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-                            break;
-
-                        case 1: // Pumps off, valves in pos A
-                            setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
-                            setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
-                            setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
-                            setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
-                            break;
-
-                        case 2: // Pumps on, valves in pos A
-                            setBloodPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialOutPumpTargetRate( 500, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            break;
-
-
-                        default: // Should not get here, reset if we do
-                            toggle = 0;
-                            setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-                            setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
-                            break;
-                    }
-                }
-#endif
-            }
-#ifdef EMC_TEST_BUILD
-            button_state = stop;
-#endif
             break;
 
         default: