Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1b4447ba6fdc3d90a9013571b5710a52295c43d3 -radb32ef196a2c56d54225caa47f6d50e811cfc68
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1b4447ba6fdc3d90a9013571b5710a52295c43d3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision adb32ef196a2c56d54225caa47f6d50e811cfc68)
@@ -548,13 +548,12 @@
 {
     MESSAGE_T msg;
     DG_SERVICE_RECORD_T service;
+    U08 *payloadPtr = msg.payload;
 
     // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
     // has been already checked in POST
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( DG_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
-    U08 *payloadPtr = msg.payload;
-
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID      = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
@@ -725,6 +724,7 @@
     return result;
 }
 
+#if 0
 /*********************************************************************//**
  * @brief
  * The sendDGServiceRecord function sends out the DG service record.
@@ -763,6 +763,7 @@
 
     return result;
 }
+#endif
 
 /*********************************************************************//**
  * @brief
@@ -864,6 +865,8 @@
     return result;
 }
 
+#if 0
+// For Phase 1B
 /*********************************************************************//**
  * @brief
  * The handleDGScheduledRunsRequest function handles a request for DG
@@ -892,6 +895,7 @@
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
 }
+#endif
 
 /*********************************************************************//**
 * @brief
@@ -1131,12 +1135,7 @@
 
             if ( TRUE == isSet )
             {
-#ifndef _RELEASE_
-                if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_TRIMMER_HEATER ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-                {
-                    startHeater( DG_TRIMMER_HEATER );
-                }
+                startHeater( DG_TRIMMER_HEATER );
             }
             else
             {
@@ -3145,6 +3144,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
 
+#if 0
 /*********************************************************************//**
 * @brief
 * The handleGetDGServiceRecord function handles a request to get the DG
@@ -3203,6 +3203,7 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
+#endif
 
 /*********************************************************************//**
  * @brief