Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r4daa230ef3173ca71bab91c0c28457e6ac341797 -re95b1d3c47166be8a6852818a70b4c6231881b86
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 4daa230ef3173ca71bab91c0c28457e6ac341797)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision e95b1d3c47166be8a6852818a70b4c6231881b86)
@@ -56,12 +56,7 @@
 #define MAX_CONDUCTIVITY_SENSOR_FAILURES                5                                           ///< maximum number of conductivity sensor errors within window period before alarm.
 #define MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS       ( 60 * MS_PER_SECOND )                      ///< Conductivity sensor error window.
 
-#define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE           1.0F                                        ///< Out of range value for RO rejection ratio when CPi conductivity is zero.
-#define MAX_RO_REJECTION_RATIO_ALLOW                    0.10F                                       ///< Maximum RO rejection ratio.
-#define MAX_CPO_CONDUCTIVITY_ALLOW                      30.0F                                       ///< Maximum CPo sensor conductivity value.
-
 #define COND_SENSOR_PERSISTENCE_PERIOD                  ( 5 * MS_PER_SECOND )                       ///< Persistence period for conductivity sensor out of range error.
-#define RO_REJECTION_RATIO_PERSISTENCE_PERIOD           ( 10 * MS_PER_SECOND )                      ///< Persistence period for RO rejection ratio.
 
 #define EMSTAT_PICO_MEASUREMENT_OFFSET                  0x8000000                                   ///< Emstat measurement offset.
 // The below Emstat status values come from the MethodScript-v1_2-1.pdf. See page 10 table 4 for further information
@@ -200,9 +195,7 @@
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES,          MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE,      COND_SENSOR_PERSISTENCE_PERIOD,            COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE,       COND_SENSOR_PERSISTENCE_PERIOD,            COND_SENSOR_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE,             RO_REJECTION_RATIO_PERSISTENCE_PERIOD,     RO_REJECTION_RATIO_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS,           COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD, COND_SENSOR_BAD_STATUS_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, COND_SENSOR_PERSISTENCE_PERIOD,            COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR,             COND_SENSORS_BAD_CHAR_TIME_OUT_MS,         COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR,             COND_SENSORS_BAD_CHAR_TIME_OUT_MS,         COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
     initPersistentAlarm( ALARM_ID_DG_CD1_COND_SENSOR_INVALID_CHAR,             COND_SENSORS_BAD_CHAR_TIME_OUT_MS,         COND_SENSORS_BAD_CHAR_TIME_OUT_MS );
@@ -344,33 +337,6 @@
 
 /*********************************************************************//**
  * @brief
- * The checkRORejectionRatio function checks RO rejection ratio and outlet water
- * conductivity. The function triggers an alarm when RO rejection ratio or
- * outlet water conductivity is out of allowed range for period of time.
- * @details Inputs: roRejectionRatio, CPo sensor conductivity
- * @details Outputs: Triggered alarm
- * @return none
- *************************************************************************/
-void checkRORejectionRatio( void )
-{
-#ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_RO_RATIO_CHECK ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-    {
-        F32 cpo                      = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
-        BOOL isRORejectionOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ? TRUE : FALSE );
-        BOOL isCPoOutOfRange         = ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW ? TRUE : FALSE );
-
-        // Fault alarm per PRS 483
-        checkPersistentAlarm( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, isCPoOutOfRange, cpo, MAX_CPO_CONDUCTIVITY_ALLOW );
-
-        // Fault alarm per PRS 483
-        checkPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORejectionOutOfRange, roRejectionRatio, MAX_RO_REJECTION_RATIO_ALLOW );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The getConductivityValue function gets the compensated conductivity
  * value for a given conductivity sensor id.
  * @details Inputs: compensatedConductivityValues[]