Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r4d94719436e8a8822198067f59147e3e024ac42c -re5d1d67106a93a6cd1b5692b586625d715732e2f
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4d94719436e8a8822198067f59147e3e024ac42c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
@@ -201,10 +201,11 @@
 static F32  syringePumpDACVref;                                                 ///< DAC Vref setting for force sensor.
 
 static U08  lastSyringePumpADCReadCtr;                                          ///< Remember last ADC read counter to check new reads are fresh.
+
+// TODO: Enable when self-test ready
+// static SYRINGE_PUMP_SELF_TEST_STATE_T syringePumpSelfTestState;                 ///< Current syringe pump self-test state.
+// static U32 syringePumpSelfTestTimerCount;                                       ///< Timer counter for syringe pump self-test.
 
-static SYRINGE_PUMP_SELF_TEST_STATE_T syringePumpSelfTestState;                 ///< Current syringe pump self-test state.
-static U32 syringePumpSelfTestTimerCount;                                       ///< Timer counter for syringe pump self-test.
-
 // ********** private function prototypes **********
 
 static void resetSyringePumpRequestFlags( void );
@@ -245,7 +246,6 @@
 {
     syringePumpState = SYRINGE_PUMP_INIT_STATE;
     heparinDeliveryState = HEPARIN_STATE_OFF;
-    syringePumpSelfTestState = SYRINGE_PUMP_SELF_TEST_STATE_START;
 
     syringePumpSetRate = 0.0;
     syringePumpSetToggleTime = 0;
@@ -257,7 +257,6 @@
     syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
 
     syringePumpDataPublicationTimerCounter = 0;
-    syringePumpSelfTestTimerCount = 0;
     syringePumpSpeedCalcTimerCounter = 0;
     syringePumpRampTimerCtr = 0;