Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241)
@@ -188,20 +188,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize Balancing chamber and Ultrafiltration valves
     for ( i = FIRST_BC_VALVE; i <= LAST_BC_VALVE; i++ )
     {
         setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     }
 
-    // TODO: To be removed once HDD clean up is done
-    for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ )
-    {
-        setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    }
-
     requestConcentratePumpOff( D11_PUMP, parkPumps );
     requestConcentratePumpOff( D10_PUMP, parkPumps );
     requestConcentratePumpOff( D76_PUMP, parkPumps );
@@ -245,21 +239,14 @@
     setValveStateDelayed( D40_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D47_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D3_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    setValveStateDelayed( DD_M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
+    setValveStateDelayed( M4_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
     // De-energize portion of balancing chamber valves.
     setValveStateDelayed( D19_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D20_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D21_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
     setValveStateDelayed( D22_VALV, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
 
-    // TODO: To be removed once HDD clean up is done
-    // De-energize Ultrafiltration valves
-    for ( i = FIRST_UF_VALVE; i <= FIRST_UF_VALVE; i++ )
-    {
-        setValveStateDelayed( (DD_VALVES_T)i, VALVE_STATE_CLOSED, DELAY_VALVE_MS );
-    }
-
     requestConcentratePumpOff( D11_PUMP, parkPumps );
     requestConcentratePumpOff( D10_PUMP, parkPumps );
     requestConcentratePumpOff( D76_PUMP, parkPumps );