Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra2c32d4d221603054ca9ad7a097112caebf08c4e -r81cd7f8794002173ba1b8bb886d33a03ce3c6f83
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a2c32d4d221603054ca9ad7a097112caebf08c4e)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 81cd7f8794002173ba1b8bb886d33a03ce3c6f83)
@@ -326,7 +326,6 @@
  *************************************************************************/
 void execHeatersMonitor( void )
 {
-    // TODO check for the heaters' fault flags and fault if any of them are at fault it should alarm
 #ifndef IGNORE_HEATERS_MONITOR
     F32 primaryHeatersInternalTemp = getTemperatureValue( TEMPSENSORS_PRIMARY_HEATER_INTERNAL );
     F32 trimmerHeaterInternalTemp  = getTemperatureValue( TEMPSENSORS_TRIMMER_HEATER_INTERNAL );
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r99b0c8f1ff9f9319f68e5043cd8c007e317a05c0 -r81cd7f8794002173ba1b8bb886d33a03ce3c6f83
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 99b0c8f1ff9f9319f68e5043cd8c007e317a05c0)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 81cd7f8794002173ba1b8bb886d33a03ce3c6f83)
@@ -130,11 +130,6 @@
 
 static F32 roPumpOpenLoopTargetDutyCycle = 0;                                                      ///< Target RO pump open loop PWM.
 
-/* TODO These variables are used for POST. POST has not been implemented yet
-static RO_PUMP_SELF_TEST_STATE_T roPumpSelfTestState = RO_PUMP_SELF_TEST_STATE_START;              ///< Current RO pump self test state.
-static U32 roPumpSelfTestTimerCount = 0;                                                           ///< Timer counter for RO pump self test.
-*/
-
 static S32 measuredFlowReadingsSum = 0;                                                            ///< Raw flow reading sums for averaging.
 static U32 flowFilterCounter = 0;                                                                  ///< Flow filtering counter.
 
@@ -470,23 +465,6 @@
 
 /*********************************************************************//**
  * @brief
- * The execROPumpTest function executes the state machine for the RO pump
- * self-test.
- * @details Inputs: TODO FILL UP
- * @details Outputs: TODO FILL UP
- * @return the current state of the ROPump self test.
- *************************************************************************/
-SELF_TEST_STATUS_T execROPumpTest( void )
-{
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
-
-    // TODO - implement self-test(s)
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleROPumpOffState function handles the RO pump off state of the
  * controller state machine.
  * @details Inputs: roPumpControlMode, roPumpPWMDutyCyclePctSet,
Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r0ff3afb455342a5abde4bb3e6a99819c9ed05164 -r81cd7f8794002173ba1b8bb886d33a03ce3c6f83
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 0ff3afb455342a5abde4bb3e6a99819c9ed05164)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 81cd7f8794002173ba1b8bb886d33a03ce3c6f83)
@@ -57,8 +57,6 @@
 
 BOOL isROPumpRunning( void );
 
-SELF_TEST_STATUS_T execROPumpTest( void );
-
 F32  getTargetROPumpFlowRate( void );
 F32  getMeasuredROFlowRate( void );
 
Index: firmware/App/DGCommon.h
===================================================================
diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -r81cd7f8794002173ba1b8bb886d33a03ce3c6f83
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision cea079b61dbd17b2ddaec99b1124248147d14e72)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 81cd7f8794002173ba1b8bb886d33a03ce3c6f83)
@@ -47,7 +47,7 @@
 //    #define PRESSURES_DEBUG                 1
     #define DISABLE_DIALYSATE_CHECK         1
 //    #define IGNORE_DRAIN_PUMP_MONITOR       1
-    #define IGNORE_HEATERS_MONITOR          1
+//    #define IGNORE_HEATERS_MONITOR          1
     #define IGNORE_RO_PUMP_MONITOR          1
 //    #define DISABLE_RO_RATIO_CHECK          1
     #define DISABLE_COND_SENSOR_CHECK       1