Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rcef507d49f7a4e5012428fea9e32601b29bc664a -rc21aee456ffbfed5aba9a5983c295acf0595afa3
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision cef507d49f7a4e5012428fea9e32601b29bc664a)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision c21aee456ffbfed5aba9a5983c295acf0595afa3)
@@ -133,7 +133,6 @@
 static OVERRIDE_U32_T concentratePumpDataPublishInterval;                                                       ///< Concentrate pump data publish interval.
 
 static CONCENTRATE_PUMP_T concentratePumps[ NUM_OF_CONCENTRATE_PUMPS ];                                         ///< Array of concentrate pumps' data structure.
-//static OVERRIDE_U32_T hasParkBeenRequested[ NUM_OF_CONCENTRATE_PUMPS ];                                         ///< Flag indicates a request to park the pump.
 static OVERRIDE_F32_T pumpTargetSpeed[ NUM_OF_CONCENTRATE_PUMPS ];                                              ///< Target concentrate pumps' speed (mL/min).
 static OVERRIDE_U32_T pumpTargetRevCnt[ NUM_OF_CONCENTRATE_PUMPS ];                                             ///< Target concentrate pump revolution count
 static OVERRIDE_U32_T pumpMesauredRevCnt[ NUM_OF_CONCENTRATE_PUMPS ];                                           ///< Current measured concentrate pump revolution count
@@ -186,10 +185,6 @@
         measuredPumpSpeed[ pumpId ].ovData                          = 0.0F;
         measuredPumpSpeed[ pumpId ].override                        = OVERRIDE_RESET;
         concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested      = FALSE;
-//        hasParkBeenRequested[ pumpId ].data                         = FALSE;
-//        hasParkBeenRequested[ pumpId ].ovInitData                   = FALSE;
-//        hasParkBeenRequested[ pumpId ].ovData                       = FALSE;
-//        hasParkBeenRequested[ pumpId ].override                     = OVERRIDE_RESET;
         parked[ pumpId ].data                                       = FALSE;
         parked[ pumpId ].ovInitData                                 = FALSE;
         parked[ pumpId ].ovData                                     = FALSE;
@@ -722,7 +717,6 @@
 
     if ( pumpId < NUM_OF_CONCENTRATE_PUMPS )
     {
-        // result = (BOOL)getU32OverrideValue( &hasParkBeenRequested[ pumpId ] );
         result = hasParkBeenRequested[ pumpId ];
     }
     else
@@ -1473,12 +1467,8 @@
 BOOL testConcentratePumpParkRequestOverride( MESSAGE_T *message )
 {
     BOOL                          result = FALSE;
-    // TEST_OVERRIDE_ARRAY_PAYLOAD_T override;
-    // OVERRIDE_TYPE_T               ovType = getOverrideArrayPayloadFromMessage( message, &override );
 
-    // Verify tester has logged in with DD and override type is valid
-    // if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    // Verify payload length is valid
+    // Verify tester has logged in with DD and payload length is valid
     if ( ( TRUE == isTestingActivated() ) && ( sizeof( U32 ) == message->hdr.payloadLen ) )
     {
         U32 pumpId;
@@ -1501,40 +1491,6 @@
             }
         }
 
-//        U32 pumpId = override.index;
-//
-//        // Verify concentrate pump index of override
-//        if ( pumpId < NUM_OF_CONCENTRATE_PUMPS )
-//        {
-//            if ( OVERRIDE_OVERRIDE == ovType )
-//            {
-//                U32 value = override.state.u32;
-//
-//                hasParkBeenRequested[ pumpId ].ovData   = value;
-//                hasParkBeenRequested[ pumpId ].override = OVERRIDE_KEY;
-//
-//                if ( TRUE == hasParkBeenRequested[ pumpId ].ovData )
-//                {
-//                    // If pump is running, stop it w/ park option
-//                    if ( TRUE == concentratePumps[ pumpId ].hasTurnOnPumpsBeenRequested )
-//                    {
-//                        requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, TRUE );
-//                    }
-//                    // If pump is already stopped, just send park command
-//                    else
-//                    {
-//                        stopConcentratePump( (CONCENTRATE_PUMPS_T)pumpId );
-//                    }
-//                    hasParkBeenRequested[ pumpId ].override = OVERRIDE_RESET;
-//                    hasParkBeenRequested[ pumpId ].ovData   = hasParkBeenRequested[ pumpId ].ovInitData;
-//                }
-//            }
-//            else
-//            {
-//                hasParkBeenRequested[ pumpId ].override = OVERRIDE_RESET;
-//                hasParkBeenRequested[ pumpId ].ovData   = hasParkBeenRequested[ pumpId ].ovInitData;
-//            }
-
         result = TRUE;
     }
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -rc21aee456ffbfed5aba9a5983c295acf0595afa3
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision c21aee456ffbfed5aba9a5983c295acf0595afa3)
@@ -111,6 +111,7 @@
 #define FPGA_D11_PUMP_PARK_FAULT_BIT    0x08                    ///< Acid Concentrate pump park fault status bit mask.
 #define FPGA_D10_PUMP_PARK_FAULT_BIT    0x20                    ///< Bicarb Concentrate pump park fault status bit mask.
 #define FPGA_CONC_PUMP_PARK_COMMAND     0x80                    ///< Park command bit for the concentrate pumps.
+#define FPGA_CONC_PUMP_CLEAR_PARK_BIT   0x7F                    ///< Clear Park  bit for the concentrate pumps.
 #define FPGA_POWER_OUT_TIMEOUT_MS       ( 2 * MS_PER_SECOND )   ///< FPGA power out timeout in milliseconds.
 
 #define FPGA_D12_PUMP_ERROR_BIT         0x01                    ///< Fresh dialysate pump error bit mask.
@@ -1224,7 +1225,7 @@
  *************************************************************************/
 void setFPGAD11PumpControl( U08 control )
 {
-    CLEAR_FPGA_ACTUATOR_BITS( fpgaD11PumpControl, FPGA_CONC_PUMP_PARK_COMMAND);  // preserve msb (park command bit)
+    CLEAR_FPGA_ACTUATOR_BITS( fpgaD11PumpControl, FPGA_CONC_PUMP_CLEAR_PARK_BIT);  // preserve msb (park command bit)
     SET_FPGA_ACTUATOR_BITS( fpgaD11PumpControl, control);
 }
 
@@ -1245,7 +1246,7 @@
  *************************************************************************/
 void setFPGAD10PumpControl( U08 control )
 {
-    CLEAR_FPGA_ACTUATOR_BITS( fpgaD10PumpControl, FPGA_CONC_PUMP_PARK_COMMAND );  // preserve msb (park command bit)
+    CLEAR_FPGA_ACTUATOR_BITS( fpgaD10PumpControl, FPGA_CONC_PUMP_CLEAR_PARK_BIT );  // preserve msb (park command bit)
     SET_FPGA_ACTUATOR_BITS( fpgaD10PumpControl, control );
 }
 
@@ -1266,7 +1267,7 @@
  *************************************************************************/
 void setFPGAD76PumpControl( U08 control )
 {
-    CLEAR_FPGA_ACTUATOR_BITS( fpgaD76PumpControl, FPGA_CONC_PUMP_PARK_COMMAND );  // preserve msb (park command bit)
+    CLEAR_FPGA_ACTUATOR_BITS( fpgaD76PumpControl, FPGA_CONC_PUMP_CLEAR_PARK_BIT );  // preserve msb (park command bit)
     SET_FPGA_ACTUATOR_BITS( fpgaD76PumpControl, control );
 }