Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -r788a0b1a638d815df1e83af80cba7be03af2020c -r3b2d4ed995f1fcbba4bb0c3a09c3c4d94cb362d1
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 788a0b1a638d815df1e83af80cba7be03af2020c)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision 3b2d4ed995f1fcbba4bb0c3a09c3c4d94cb362d1)
@@ -142,31 +142,8 @@
 static BOOL dryBiCartPressureDecayStartTimeFlag;                                                ///< Dry bicart d66 pressure decay start timer.
 static DRY_BICART_OPERATION_T dryBicartStartRequest;                                            ///< Dry bicart operation, fill or supply or drain request
 
-// drybicart mixing
-static OVERRIDE_F32_T dryBiCartAcidMixVolume;                                                   ///< Acid concentrate volume in ml ( overrideable).
-static OVERRIDE_F32_T dryBiCartBicarbMixVolume;                                                 ///< Bicarb concentrate volume in ml ( overrideable).
+static DRY_BICART_OPERATION_T prevDryBicartState;                                               ///< Dry BiCart State Change Tracker
 
-static OVERRIDE_F32_T dryBiCartAcidMixVolumeKpGain;                                             ///< Acid kp gain.
-static OVERRIDE_F32_T dryBiCartAcidMixVolumeKiGain;                                             ///< Acid ki gain.
-
-static OVERRIDE_F32_T dryBiCartBicarbMixVolumeKpGain;                                           ///< Bicarb kp gain
-static OVERRIDE_F32_T dryBiCartBicarbMixVolumeKiGain;                                           ///< Acid ki gain.
-
-static DIALYSATE_MIXING_DATA_T dialysateMix[ NUM_OF_DIALYSATE_MIXING_ID ];                      ///< Array of dialysate mixing data structure.
-
-static OVERRIDE_F32_T dryBiCartBicarbTargetConductivity;                                        ///< Target bicarb conductivity
-static OVERRIDE_F32_T dryBiCartBicarbDeltaConductivity;                                         ///< Target delta conductivity
-
-static OVERRIDE_F32_T dryBiCartDialysateTargetConductivity;                                     ///< Acid bicarb mix conductivity
-static OVERRIDE_F32_T dryBiCartDialysateDeltaConductivity;                                      ///< Acid bicarb delta conductivity
-
-static OVERRIDE_U32_T dryBiCartMixControlInterval;                                              ///< Mix control interval
-
-static PI_CONTROLLER_SIGNALS_DATA bicarbControlSignals;                                         ///< Bicarb closed loop control signal data
-static PI_CONTROLLER_SIGNALS_DATA acidControlSignals;                                           ///< Acid closed loop control signal data
-
-static DRY_BICART_OPERATION_T prevDryBicartState;                                               ///< Last dry bicart operation prior to current state.
-
 // ********** private function prototypes **********
 
 static void updateDrybicartOperation(void);
@@ -271,7 +248,7 @@
     dryBiCartDrainLastCondSampleTime                    = 0;
     dryBiCartDrainCondStableCount                       = 0;
     dryBiCartDrainTimePeriod                            = 0;
-    dryBiCartPersistanceStartTime                       = 0;
+    dryBiCartPersistenceStartTime                       = 0;
     drybicartPersistenceOnLowercartPressureStartTime    = 0;
     prevDryBicartState                                  = DRY_BICART_IDLE;
 }