Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -r38ee99e9adeb19cacb0c88807e8f6f48b076a241
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 38ee99e9adeb19cacb0c88807e8f6f48b076a241)
@@ -199,12 +199,6 @@
     {
         commandedBCValveStates |= ( getValveState( i ) == ENERGIZED ? 0x01 << ( i - FIRST_BC_VALVE ) : 0 );
     }
-
-    // flag Ultrafiltration valves that are currently commanded to be energized
-    for ( i = FIRST_UF_VALVE; i <= LAST_UF_VALVE; i++ )
-    {
-        commandedUFValveStates |= ( getValveState( i ) == ENERGIZED ? 0x01 << ( i - FIRST_UF_VALVE ) : 0 );
-    }
 }
 
 /*********************************************************************//**
@@ -228,10 +222,9 @@
         case VALVE_STATE_CLOSED:
             if ( ( D53_VALV == valveID )  || ( D52_VALV == valveID )  || ( D8_VALV == valveID )  || ( D54_VALV == valveID )  || ( D14_VALV == valveID )  ||
                  ( D65_VALV == valveID ) || ( D64_VALV == valveID )  || ( D31_VALV == valveID )  || ( D34_VALV == valveID ) || ( D35_VALV == valveID )  ||
-                 ( D40_VALV == valveID )  || ( D47_VALV == valveID )  || ( D3_VALV == valveID )  || ( DD_M4_VALV == valveID )  || ( D23_VALV == valveID ) ||
+                 ( D40_VALV == valveID )  || ( D47_VALV == valveID )  || ( D3_VALV == valveID )  || ( M4_VALV == valveID )  || ( D23_VALV == valveID ) ||
                  ( D19_VALV == valveID ) || ( D25_VALV == valveID ) || ( D21_VALV == valveID ) || ( D24_VALV == valveID ) || ( D20_VALV == valveID ) ||
-                 ( D26_VALV == valveID ) || ( D22_VALV == valveID ) || ( D69_VALV == valveID ) || ( D70_VALV == valveID ) || ( D71_VALV == valveID ) ||
-                 ( D72_VALV == valveID ) )
+                 ( D26_VALV == valveID ) || ( D22_VALV == valveID ) )
             {
                 result = TRUE;
             }
@@ -423,25 +416,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setUFValvesStatetoClosedState function sets all UF valves
- * to close state.
- * @details \b Inputs: none
- * @details \b Outputs: valve states
- * @return none.
- *************************************************************************/
-void setUFValvesStatetoClosedState( void )
-{
-    DD_VALVES_T valve;
-
-    // Set all UF valves to closed state
-    for ( valve = FIRST_UF_VALVE; valve <= LAST_UF_VALVE; valve++ )
-    {
-        setValveState( valve, VALVE_STATE_CLOSED );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The publishValvesStates function publishes DD valves states at the set interval.
  * @details \b Inputs: valvesStatesPublicationTimerCounter
  * @details \b Outputs: valvesStatesPublicationTimerCounter
@@ -458,9 +432,8 @@
 
         data.valvesStatus       = getFPGAValveStates();
         data.valvesBCStatus     = getFPGAValveBCStates();
-        data.valvesUFStatus     = getFPGAValveUFStates();
 
-        for ( i = 0; i < DD_NUM_OF_VALVES; i++ )
+        for ( i = 0; i < LAST_DD_VALVE; i++ )
         {
             data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i );
         }