Index: TDDefs.h
===================================================================
diff -u -re21ea4a2c6bf056900bd3c489c6a3df747bc16fc -r212efecad6005e59add83fd3066a5ba1f6c95bbf
--- TDDefs.h	(.../TDDefs.h)	(revision e21ea4a2c6bf056900bd3c489c6a3df747bc16fc)
+++ TDDefs.h	(.../TDDefs.h)	(revision 212efecad6005e59add83fd3066a5ba1f6c95bbf)
@@ -611,7 +611,7 @@
     TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,                              ///< Arterial pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW,                              ///< Venous pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC,                          ///< Venous pressure alarm limit asymmetric (in mmHg)
-    TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,                              ///< TMP alarm limit window (in mmHg)
+    TREATMENT_PARAM_TMP_PRES_LIMIT_WINDOW,                              ///< TMP pressure alarm limit window (in mmHg)
     TREATMENT_PARAM_BP_MEAS_INTERVAL,                                   ///< Blood pressure measurement interval (in minutes)
     TREATMENT_PARAM_PRIME_DISCARD_VOLUME,                               ///< Prime discard volume (in mL)
     TREATMENT_PARAM_PRIME_RINSEBACK_VOLUME,                             ///< Prime rinseback volume (in mL)
@@ -623,10 +623,6 @@
     TREATMENT_PARAM_HEART_RATE_HIGH_ALARM_LIMIT,                        ///< Heart rate high alarm limit (BPM)
     TREATMENT_PARAM_PRES_ALARM_PERSISTENCE,                             ///< Pressure alarms persistence (seconds)
     TREATMENT_PARAM_LAST_UINT = TREATMENT_PARAM_PRES_ALARM_PERSISTENCE, ///< Last unsigned integer treatment parameter
-    TREATMENT_PARAM_ACID_CONCENTRATE,                                   ///< TODO remove after handling the states where these are used
-    TREATMENT_PARAM_BICARB_CONCENTRATE,
-    TREATMENT_PARAM_FIRST_INT,
-    TREATMENT_PARAM_LAST_INT,
     TREATMENT_PARAM_SUBST_FLUID_VOLUME,                                 ///< Substitution fluid volume (in liters)
     TREATMENT_PARAM_FIRST_F32 = TREATMENT_PARAM_SUBST_FLUID_VOLUME,     ///< First floating point treatment parameter
     TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME,                               ///< Heparin bolus volume (in mL)
@@ -697,26 +693,6 @@
 };
 typedef enum Hepatitis_B_Status HEPATITIS_B_STATUS_T;                   ///< Type for hepatitis B status enumeration
 
-//TODO remove
-/// Enumeration of acid concentrates.
-enum Acid_Concentrates
-{
-    ACID_CONC_TYPE_FRESENIUS_08_1251_1 = 0,                             ///< Fresensius Naturalyte Acid Concentrate 08-1251-1
-    ACID_CONC_TYPE_FRESENIUS_08_2251_0,                                 ///< Fresensius Naturalyte Acid Concentrate 08-2251-0
-    ACID_CONC_TYPE_FRESENIUS_08_3251_9,                                 ///< Fresensius Naturalyte Acid Concentrate 08-3251-9
-    NUM_OF_ACID_CONC_TYPES                                              ///< Number of acid concentrates
-};
-typedef enum Acid_Concentrates ACID_CONCENTRATE_TYPE_T;                 ///< Type for acid concentrates enumeration
-
-//TODO remove
-/// Enumeration of bicarbonate concentrates.
-enum Bicarb_Concentrates
-{
-    BICARB_CONC_TYPE_FRESENIUS_CENTRISOL = 0,                           ///< Fresenius Centrisol Liquid Bicarbonate
-    NUM_OF_BICARB_CONC_TYPES                                            ///< Number of bicarbonate concentrates
-};
-typedef enum Bicarb_Concentrates BICARB_CONCENTRATE_TYPE_T;             ///< Type for bicarbonate concentrates enumeration
-
 /// Enumeration of Heparin types.
 enum Heparin_Types
 {