Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r4b37115aead2565979d889518c492389757a6346 -r52e31227bb0514145596b43bd2f39782c3648f0a
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 4b37115aead2565979d889518c492389757a6346)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 52e31227bb0514145596b43bd2f39782c3648f0a)
@@ -354,10 +354,7 @@
         if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
 #endif
         {
-            if ( getCurrentOperationMode() != DG_MODE_INIT )
-            {
-                checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_DRAIN_PUMP_DIR_HALL_SENSOR, dirHallSensorErrorCount );
-            }
+            checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_DRAIN_PUMP_DIR_HALL_SENSOR, dirHallSensorErrorCount );
         }
 
         switch( drainPumpState )
@@ -383,11 +380,8 @@
                 if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
 #endif
                 {
-                    if ( getCurrentOperationMode() != DG_MODE_INIT )
-                    {
-                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isOffCurrentOut, currentA, DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A );
-                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, FALSE, getFPGADrainPumpDirection(), DRAIN_PUMP_FORWARD_DIR );
-                    }
+                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isOffCurrentOut, currentA, DRAIN_PUMP_MAX_CURRENT_WHEN_OFF_A );
+                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, FALSE, getFPGADrainPumpDirection(), DRAIN_PUMP_FORWARD_DIR );
                 }
             }
             break;
@@ -415,7 +409,9 @@
                 checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, rpmHall, MAX_ALLOWED_OPEN_LOOP_RPM_OUT_OF_RANGE );
                 checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_OFF_FAULT, FALSE, rpmHall, MIN_DRAIN_PUMP_RPM );
 
-                if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
+#ifndef _RELEASE_
+                if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
+#endif
                 {
                     checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
                 }
@@ -431,10 +427,7 @@
                 if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
 #endif
                 {
-                    if ( getCurrentOperationMode() != DG_MODE_INIT )
-                    {
-                        checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
-                    }
+                    checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_DIRECTION_INVALID, isDirInvalid, (F32)direction, DRAIN_PUMP_FORWARD_DIR );
                 }
             }
             break;
@@ -451,13 +444,10 @@
         if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
 #endif
         {
-            if ( getCurrentOperationMode() != DG_MODE_INIT )
-            {
                 // Check the persistent alarm for the maximum drain pump current
-                BOOL isCurrentOutOfRange = ( currentA > DRAIN_PUMP_MAX_CURRENT_A ? TRUE : FALSE );
+            BOOL isCurrentOutOfRange = ( currentA > DRAIN_PUMP_MAX_CURRENT_A ? TRUE : FALSE );
 
-                checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isCurrentOutOfRange, currentA, DRAIN_PUMP_MAX_CURRENT_A );
-            }
+            checkPersistentAlarm( ALARM_ID_DG_DRAIN_PUMP_CURRENT_OUT_OF_RANGE, isCurrentOutOfRange, currentA, DRAIN_PUMP_MAX_CURRENT_A );
         }
     }