Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r7c5eba5948a1ed940252c6fe0b1c56f17b313980 -r7cd8a5523de307f514f6c84df29dc7bc72c6a0e4
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7cd8a5523de307f514f6c84df29dc7bc72c6a0e4)
@@ -73,7 +73,6 @@
 #define RO_PUMP_LOOKUP_TABLE_SIZE                       4                                                    ///< Size of array used as RO pump speed lookup table.
 #define CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN       5.0F                                                 ///< Concentrate pump additional speed during priming in mL/min.
 #define CONCENTRATE_TEST_TIME_OUT_MS                    ( 30 * MS_PER_SECOND )                               ///< Concentrate test time out period in ms.
-#define CONCENTRATE_ACID_TEST_TIME_OUT_MS               ( 60 * MS_PER_SECOND )
 #define DELAY_FMP_CHECK_START_BY_MS                     ( 10 * MS_PER_SECOND )                               ///< Delay start of FMP check during dialysate deliver state by this amount of time (in ms).
 #define CONCENTRATE_TEST_COND_COLLECTION_DELAY_MS       ( 5 * MS_PER_SECOND )                                ///< Concentrate test conductivity data collection delay in milliseconds.
 
@@ -784,11 +783,10 @@
         acidConductivitySampleCount++;
     }
 
-    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_ACID_TEST_TIME_OUT_MS ) )
+    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {
         F32 acidCondUSPerCM      = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_ACID_TEST ].acidConduSPerCM;
         BOOL hasAcidTestPassed   = FALSE;
-        BOOL hasCD1CD2TestPassed = FALSE;
 
         averageBicarbConductivity = totalBicarbConductivity / bicarbConductivitySampleCount;
         averageAcidConductivity   = totalAcidConductivity / acidConductivitySampleCount;
@@ -809,17 +807,8 @@
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageBicarbConductivity, acidCondUSPerCM )
         }
 
-        if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) ) )
+        if ( TRUE == hasAcidTestPassed )
         {
-            hasCD1CD2TestPassed = TRUE;
-        }
-        else
-        {
-            SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_CD1_CD2_CHECK_FAULT, pctDiffInConductivity )
-        }
-
-        if ( ( TRUE == hasAcidTestPassed ) && ( TRUE == hasCD1CD2TestPassed ) )
-        {
             result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
             setModeFillStateTransition( result );
         }
@@ -851,15 +840,13 @@
              * If the acid and bicarb conductivity values are at about 100% of the target concentrate during fill, transition to the next state
              * If the acid and bicarb conductivity values are not at 100% but the maximum prime time has elapsed, transition to the next state
              */
-            F32 acidConduSPerCM       = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
             F32 bicarbConduSPerCM     = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-            F32 acidFillConduSPerCM   = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_NORMAL_OP ].acidConduSPerCM;
             F32 bicarbFillConduSPerCM = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_NORMAL_OP ].bicarbConduSPerCM;
 
             /* we are insisting conductivity reach 100% of expected level since signal is very noisy and peak noise will reach 100% when average is about 93%.
              * if sensor noise is reduced, this level should also be reduced accordingly.
              */
-            if ( ( acidConduSPerCM >= ( acidFillConduSPerCM * HUNDRED_PERCENT_FACTOR ) ) && ( bicarbConduSPerCM >= ( bicarbFillConduSPerCM * HUNDRED_PERCENT_FACTOR ) ) )
+            if ( bicarbConduSPerCM >= ( bicarbFillConduSPerCM * HUNDRED_PERCENT_FACTOR ) )
             {
                 result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
                 setModeFillStateTransition( result );