Index: firmware/App/DGCommon.h
===================================================================
diff -u -r6bb7cd715299d16c131ab074fac0e62d8022f235 -r71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca)
@@ -25,7 +25,7 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
-#define DG_VERSION_BUILD        17
+#define DG_VERSION_BUILD        83
 
 // ********** build switches **********
 
@@ -34,7 +34,7 @@
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
-//    #define DISABLE_HEATERS_AND_TEMPS       1
+//   #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
     #define SKIP_CAL_CHECK               1
@@ -53,12 +53,13 @@
     #define THD_USING_TRO_CONNECTOR         1
     #define DISABLE_FLOW_CHECK_IN_FILL      1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
-//    #define NEW_FMD_FLOW_SENSOR             1
 
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom
     #define DISABLE_MIXING                  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
+    #define DISABLE_TRIMMER_HEATER 1
+    #define DIALYSATE_FLOW_METER_ENABLED    1
     #define DISABLE_ACK_ALARM 1
 
     #include <stdio.h>
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6bb7cd715299d16c131ab074fac0e62d8022f235 -r71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6bb7cd715299d16c131ab074fac0e62d8022f235)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 71e2ca2cd5cc70a6b9c0c258b1445c57f1445fca)
@@ -22,7 +22,6 @@
 #include "Accel.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
-#include "Fans.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
@@ -358,7 +357,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -2975,37 +2973,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none