Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rdf0a0b9ce1414b00b381e516714f9089d8e4ae21 -rc0160362dc799802ec589d5b6cf4c2bd1face77e
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision df0a0b9ce1414b00b381e516714f9089d8e4ae21)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision c0160362dc799802ec589d5b6cf4c2bd1face77e)
@@ -194,15 +194,6 @@
     roPumpControlMode                 = NUM_OF_PUMP_CONTROL_MODES;
     roPumpControlModeSet              = roPumpControlMode;
     isROPumpOn                        = FALSE;
-
-    // TODO temporary initialization
-    // Reset the calibration variables
-    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].fourthOrderCoeff = 0.0;
-    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].thirdOrderCoeff  = 0.0;
-    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].secondOrderCoeff = 0.0;
-    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].gain             = 1.0;
-    flowSensorsCalRecord.flowSensors[ CAL_DATA_RO_PUMP_FLOW_SENSOR ].offset           = 0.0;
-    // TODO temporary initialization, remove
 }
 
 /*********************************************************************//**
@@ -409,12 +400,12 @@
         F32 pressureInlet  = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
         BOOL isPumpRunning = ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) < actualPressure;
 
-        //checkPersistentAlarm( ALARM_ID_RO_PUMP_OFF_FAULT, isPumpRunning, pressureInlet, ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) );
+        checkPersistentAlarm( ALARM_ID_RO_PUMP_OFF_FAULT, isPumpRunning, pressureInlet, ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) );
 
         // Check if it has timed out
-        //if ( isAlarmActive( ALARM_ID_RO_PUMP_OFF_FAULT ) )
+        if ( isAlarmActive( ALARM_ID_RO_PUMP_OFF_FAULT ) )
         {
-            //activateSafetyShutdown();
+            activateSafetyShutdown();
         }
     }
 
@@ -845,9 +836,7 @@
         // then the flow sensors data is not stored in the NV memory or it was corrupted.
         if ( 0 == calData.flowSensors[ sensor ].calibrationTime )
         {
-#ifndef DISABLE_CAL_CHECK
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FLOW_SENSORS_INVALID_CALIBRATION, (U32)sensor );
-#endif
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, (U32)sensor );
             status = FALSE;
         }