Index: firmware/App/HDCommon.h
===================================================================
diff -u -red89b19b0b1fbab494fee7a762efae059f32b274 -r02fa169f02dd5a8caf27d1ea4441c74ba38317e8
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision ed89b19b0b1fbab494fee7a762efae059f32b274)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 02fa169f02dd5a8caf27d1ea4441c74ba38317e8)
@@ -46,8 +46,8 @@
 //    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring
 //    #define DISABLE_CRC_ERROR               1           // Do not error on bad CRC for CAN messages
     #define DISABLE_ACK_ERRORS              1           // Do not error on failure of other node(s) to ACK a message
-    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
-    #define USE_FMB_FLOW_SENSOR             1           // Use FMB flow sensor instead of flow estimation from pump speed/pressure/wearing
+//    #define USE_FMD_FLOW_SENSOR             1           // Use FMD flow sensor (on HD) instead of FMD on DG
+//    #define USE_FMB_FLOW_SENSOR             1           // Use FMB flow sensor instead of flow estimation from pump speed/pressure/wearing
     #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode
     #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode
     #define DISABLE_MOTOR_CURRENT_CHECKS    1           // Do not error on HD pump current checks
@@ -61,7 +61,6 @@
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
     #define SKIP_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
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART