Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27 -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 3e24cbff2cbf0ce9af2e998e6a9a2ed4733bbe27)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -456,7 +456,7 @@
  * @param loadCellID ID of load cell to get
  * @return the current load cell weight in grams
  *************************************************************************/
-F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID )
+F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID )
 {
     F32 result = 0.0;
 
Index: firmware/App/Controllers/DGInterface.h
===================================================================
diff -u -rac2c218b9e310a14d2872c9b4c32a6f69615088e -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision ac2c218b9e310a14d2872c9b4c32a6f69615088e)
+++ firmware/App/Controllers/DGInterface.h	(.../DGInterface.h)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -38,16 +38,6 @@
 #else
 #define FILL_RESERVOIR_TO_VOLUME_ML         1300    ///< Fill reservoir to this volume (in mL) during treatment.
 #endif
-
-/// Enumeration of load cell sensors.
-typedef enum Load_Cells
-{
-    LOAD_CELL_RESERVOIR_1_PRIMARY = 0,              ///< Primary load cell for reservoir 1.
-    LOAD_CELL_RESERVOIR_1_BACKUP,                   ///< Backup load cell for reservoir 1.
-    LOAD_CELL_RESERVOIR_2_PRIMARY,                  ///< Primary load cell for reservoir 2.
-    LOAD_CELL_RESERVOIR_2_BACKUP,                   ///< Backup load cell for reservoir 2.
-    NUM_OF_LOAD_CELLS                               ///< Number of load cell sensors.
-} LOAD_CELL_T;
 
 /// Enumeration of DG reservoirs.
 /*typedef enum DG_Reservoirs
@@ -148,7 +138,7 @@
 U32 getDGROPumpPressureSetPt( void );
 F32 getDGROPumpFlowRateMlMin( void );
 U32 getDGDrainPumpRPMSetPt( void );
-F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID );
+F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID );
 F32 getReservoirWeightSmallFilter( DG_RESERVOIR_ID_T resID );
 F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );
 
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r778f343622819491cf644dab36f3194709ce1e95 -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 778f343622819491cf644dab36f3194709ce1e95)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -52,6 +52,7 @@
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
     #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
+    //#define DISABLE_CAL_CHECK               1
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
 //    #define RAW_FLOW_SENSOR_DATA            1           // Test build will not filter flow sensor data
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rac2c218b9e310a14d2872c9b4c32a6f69615088e -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision ac2c218b9e310a14d2872c9b4c32a6f69615088e)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -97,7 +97,7 @@
         case POST_STATE_START:
             postState = POST_STATE_WATCHDOG;
 #ifdef SKIP_POST
-            postState = POST_STATE_COMPLETED;
+            postState = POST_STATE_NVDATAMGMT;
 #endif
             break;
 
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rac2c218b9e310a14d2872c9b4c32a6f69615088e -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision ac2c218b9e310a14d2872c9b4c32a6f69615088e)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -274,7 +274,7 @@
 
         //case HD_PRE_TREATMENT_PAUSE_STATE:
         //    alarmActionResumeReceived = TRUE;
-            break;
+            //break;
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE, (U32)currentPreTreatmentState );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rffaaf7d1e1eb5715eac3f7c7b424a4648526344d -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ffaaf7d1e1eb5715eac3f7c7b424a4648526344d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -1386,7 +1386,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_Hd_SEND_SERVICE_RECORD;
+    msg.hdr.msgID = MSG_ID_HD_SEND_SERVICE_RECORD;
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length;
 
     memcpy( payloadPtr, &payloadCurrNum, sizeof( U32 ) );
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rbd5622b94bc751fd9e7ccb7d34afdf69b60240ec -ra5d0cc8ffe98ed976cb0822757d06a47db92b744
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision bd5622b94bc751fd9e7ccb7d34afdf69b60240ec)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a5d0cc8ffe98ed976cb0822757d06a47db92b744)
@@ -69,13 +69,13 @@
         /*execDGInterfaceMonitor();
 
         // Monitor pressure/occlusion sensors
-        execPresOccl();
+        execPresOccl();*/
 
         // Run operation mode state machine
-        execOperationModes();
+        //execOperationModes();
 
         // Control air trap valve
-        execAirTrapController();
+        /*execAirTrapController();
 
         // Control blood pump
         execBloodFlowController();