Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -ra42f849450c65801f2d45ca9085af81a1f11269d -r0074b704ffe85b2ad5600bcdf5e591e33808cdf5
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision a42f849450c65801f2d45ca9085af81a1f11269d)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 0074b704ffe85b2ad5600bcdf5e591e33808cdf5)
@@ -52,9 +52,6 @@
 #define VBV_ENABLE_PID_STATUS_BIT_MASK          0x0010                                                  ///< VBV PID status bit mask
 #define VBV_ENABLE_BYPASS_STATUS_BIT_MASK       0x0020                                                  ///< VBV bypass status bit mask
 
-#define VALVES_DISABLE_BIT_MASK                 0x0000                                                  ///< Valves disable bit mask (command)
-#define VALVES_DISABLED_BIT_MASK                0x0000                                                  ///< Valves disabled bit mask (check)
-
 #define ENABLE_VALVE_CURRENT_RELAXATION         0x8000                                                  ///< Enable valves current relaxation
 #define DISABLE_VALVE_CURRENT_RELAXATION        0x7FFF                                                  ///< Disable valves current relaxation
 
@@ -981,6 +978,7 @@
         else
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_CONTROL_MODE_SELECTED, (U32)valve );
+            result = FALSE;
         }
     }
 
@@ -1267,28 +1265,7 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VAVLES_INVALID_POSITION_SELECTED, (U32)valve );
             break;
     }
-    /*if ( currentPositionEnum == VALVE_POSITION_A_INSERT_EJECT )
-    {
-        if ( commandedPositionEnum == VALVE_POSITION_B_OPEN )
-        {
-            valvesStatus[ valve ].targetPositionInCounts = valvesStatus[ valve ].currentPositionInCounts + nextStep;
-        }
-        if ( commandedPositionEnum == VALVE_POSITION_C_CLOSE )
-        {
-            valvesStatus[ valve ].targetPositionInCounts = valvesStatus[ valve ].currentPositionInCounts - nextStep;
-        }
-    }
 
-    else if ( currentPositionEnum == VALVE_POSITION_B_OPEN )
-    {
-        valvesStatus[ valve ].targetPositionInCounts = valvesStatus[ valve ].currentPositionInCounts - nextStep;
-    }
-
-    else if ( currentPositionEnum == VALVE_POSITION_C_CLOSE )
-    {
-        valvesStatus[ valve ].targetPositionInCounts = valvesStatus[ valve ].currentPositionInCounts + nextStep;
-    }*/
-
     // Call the function to send the set point to FPGA. Current relaxation is not
     // enabled here, so it is always false
     setFPGAValveSetPoint( valve, valvesStatus[ valve ].targetPositionInCounts, FALSE );