Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -ra6737c3bcc8286c153b778c2c395f465e76aaafb -r39fbf9fd993d5e735092cf4ad802d58d0f92f7b1
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision a6737c3bcc8286c153b778c2c395f465e76aaafb)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 39fbf9fd993d5e735092cf4ad802d58d0f92f7b1)
@@ -18,7 +18,6 @@
 #ifndef __DRY_BICART_H__
 #define __DRY_BICART_H__
 
-#include "PIControllers.h"
 #include "DDCommon.h"
 #include "DDDefs.h"
 
@@ -49,22 +48,7 @@
     U32 dryBiCartCurrentFillTime;                                       ///< Dry bicart current fill duration in milli second
     U32 dryBiCartType;                                                  ///< Dry bicart type (small-0/large-1)
     U32 dryBiCartDrainTimePeriod;                                       ///< Dry bicart drain time based on catridge type (small/large)
-
-    // TODO: remove after closed loops stabilized
-    PI_CONTROLLER_SIGNALS_DATA dryBiCartBicarbMixingControl;            ///< Dry bicart bicarb mixing closed loop control signals data
-    PI_CONTROLLER_SIGNALS_DATA dryBiCartAcidMixingControl;              ///< Dry bicart acid mixing closed loop control signals data
-
-    F32 dryBiCartAcidMixVolume;                                         ///< Dry bicart acid dose volume
-    F32 dryBiCartBicarbMixVolume;                                       ///< Dry bicart bicarb dose volume
-
-    F32 dryBiCartBicarbMixingKPgain;                                    ///< Dry bicart bicarb mixing control kp gain
-    F32 dryBiCartBicarbMixingKIgain;                                    ///< Dry bicart bicarb mixing control ki gain
-
-    F32 dryBiCartAcidMixingKPgain;                                      ///< Dry bicart acid mixing control kp gain
-    F32 dryBiCartAcidMixingKIgain;                                      ///< Dry bicart acid mixing control ki gain
-
  } DRY_BICART_DATA_T;
-
 #pragma pack(pop)
 
 // ********** public function prototypes **********
@@ -80,12 +64,6 @@
 BOOL setBicartFillRequested( void );
 BOOL setBicartDrainRequested( void );
 
-F32 getDialysateTargetConductivity( void );
-F32 getDialysateDeltaConductivity( void );
-
-F32 getBicarbMixVol( void );
-F32 getAcidMixVol( void );
-
 DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void );
  
 BOOL testDryBiCartDataPublishIntervalOverride( MESSAGE_T *message );
@@ -95,25 +73,9 @@
 BOOL testDryBiCartDrainRequestOverride( MESSAGE_T *message );
 BOOL testDryBiCartTypeOverride( MESSAGE_T *message );
 
-BOOL testDryBiCartAcidDoseVolumeOverride( MESSAGE_T *message );
-BOOL testDryBiCartBicarbDoseVolumeOverride( MESSAGE_T *message );
-
-BOOL testDryBiCartBicarbMixVolControlKpGainOverride( MESSAGE_T *message );
-BOOL testDryBiCartBicarbMixVolControlKiGainOverride( MESSAGE_T *message );
-
-BOOL testDryBiCartAcidMixVolControlKpGainOverride( MESSAGE_T *message );
-BOOL testDryBiCartAcidMixVolControlKiGainOverride( MESSAGE_T *message );
-
-BOOL testDryBiCartTargetConductivityOverride( MESSAGE_T *message );
-BOOL testDryBiCartDeltaConductivityOverride( MESSAGE_T *message );
-
-BOOL testDryBiCartAcidBicarbDeltaConductivityOverride( MESSAGE_T *message );
-BOOL testDryBiCartAcidBicarbTargetConductivityOverride( MESSAGE_T *message );
-
 BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message );
 BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message );
 
-BOOL testDryBiCartMixControlIntervalOverride( MESSAGE_T *message );
 /**@}*/
 
 #endif