Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf4199248340b66e66abbe99599d5d30ce980ea5f -rd3b7ae356aae29c99cb039713a2e120fdbce5a9c
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f4199248340b66e66abbe99599d5d30ce980ea5f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision d3b7ae356aae29c99cb039713a2e120fdbce5a9c)
@@ -107,18 +107,14 @@
 #ifndef RUN_WITHOUT_DG
     if ( TRUE == stop )
     {
-        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); // TODO - remove alarm?  Nothing to stop here.
     }
 
     // State machine to get DG to prep a reservoir so we can start a treatment
     switch ( currentStandbyState )
     {
         case STANDBY_START_STATE:
-            // Temporary test code - TODO - remove later
-            if ( TRUE == isDGCommunicating() )
-            {
-                currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
-            }
+            currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
@@ -264,7 +260,7 @@
  *************************************************************************/
 void signalAlarmActionToStandbyMode( ALARM_ACTION_T action )
 {
-    // TODO - implement
+    // Alarm actions not handled in Standby mode
 }
 
 /**@}*/