Index: DDDefs.h
===================================================================
diff -u -rdf0b360f1a0f5a23ac46b4baaddf7103791cc920 -rd8aab4af568e74f6b7f86cfbca774f61a4388fd1
--- DDDefs.h	(.../DDDefs.h)	(revision df0b360f1a0f5a23ac46b4baaddf7103791cc920)
+++ DDDefs.h	(.../DDDefs.h)	(revision d8aab4af568e74f6b7f86cfbca774f61a4388fd1)
@@ -373,15 +373,9 @@
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
     // For standalone DD system, may need to control IO valve.
     DD_M4_VALV,                                   ///< Valve Water Inlet (M4)
-#ifdef __PUMPTEST__
-    UF1,                                          ///< UF1 valve
-    UF2,                                          ///< UF2 valve
-    LAST_HYD_VALVE = UF2,                         ///< End of Hydraulics valve of group
-#else
     LAST_HYD_VALVE = DD_M4_VALV,                  ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
-#endif
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)
     D19_VALV,                                     ///< Balancing chamber Valve 2 (D19)