Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r30d20b2415fa9a6069044a54c3b1fe2c00cb894b
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 30d20b2415fa9a6069044a54c3b1fe2c00cb894b)
@@ -39,8 +39,6 @@
     P33_VALV,                                     ///< Valve (P33)
     P34_VALV,                                     ///< Valve (P34)
     P37_VALV,                                     ///< Valve (P37)
-    M7_VALV,                                      ///< Valve (M7)
-    P20_VALV,                                     ///< Valve (P20)
     NUM_OF_VALVES                                 ///< Number of valves
 } VALVES_T;
 
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rf4870116c87345ee0ea062df5b30187e1e113ddc -r30d20b2415fa9a6069044a54c3b1fe2c00cb894b
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision f4870116c87345ee0ea062df5b30187e1e113ddc)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 30d20b2415fa9a6069044a54c3b1fe2c00cb894b)
@@ -32,8 +32,6 @@
     setValveState( P34_VALV,VALVE_STATE_CLOSED );
     setValveState( P37_VALV, VALVE_STATE_CLOSED );
     setValveState( P39_VALV,VALVE_STATE_CLOSED );
-    setValveState( M7_VALV, VALVE_STATE_CLOSED );
-    setValveState( P20_VALV,VALVE_STATE_CLOSED );
 
     if (TRUE == isBoostPumpInstalled())
     {
Index: firmware/App/Modes/ModeGenPermeate.c
===================================================================
diff -u -r311c75cc5ac41b4b9ca4983df84e43af910f9be4 -r30d20b2415fa9a6069044a54c3b1fe2c00cb894b
--- firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4)
+++ firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 30d20b2415fa9a6069044a54c3b1fe2c00cb894b)
@@ -167,7 +167,6 @@
     {
         case FP_GENP_TANK_FILL_STATE:
             setValveState( M4_VALV,VALVE_STATE_OPEN );
-            setValveState( M7_VALV,VALVE_STATE_CLOSED );
             setValveState( P6_VALV,VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_OPEN );   // TODO - Change valves to handle RO rejection config
@@ -182,7 +181,6 @@
 
         case FP_GENP_TANK_FULL_STATE:
             setValveState( M4_VALV,VALVE_STATE_CLOSED );
-            setValveState( M7_VALV,VALVE_STATE_CLOSED );
             setValveState( P6_VALV,VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_CLOSED );
             setValveState( P33_VALV, VALVE_STATE_OPEN );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r1cf11f4c1f6a1f1fd40270889723fbec040fc7ec -r30d20b2415fa9a6069044a54c3b1fe2c00cb894b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 1cf11f4c1f6a1f1fd40270889723fbec040fc7ec)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 30d20b2415fa9a6069044a54c3b1fe2c00cb894b)
@@ -73,8 +73,6 @@
     setValveState( P34_VALV,VALVE_STATE_CLOSED );
     setValveState( P37_VALV, VALVE_STATE_CLOSED );
     setValveState( P39_VALV,VALVE_STATE_CLOSED );
-    setValveState( M7_VALV, VALVE_STATE_CLOSED );
-    setValveState( P20_VALV,VALVE_STATE_CLOSED );
 
     signalROPumpHardStop();