Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r5c2e890457bce1c56779ad025cf2636a7b4449bf
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5c2e890457bce1c56779ad025cf2636a7b4449bf)
@@ -1659,13 +1659,15 @@
                 handleSetFansDutyCycleOverrideRequest( message );
                 break;
 
+#ifndef _RELEASE_
             case MSG_ID_HD_GET_SW_CONFIG_RECORD:
                 handleGetHDSoftwareConfigRecord( message );
                 break;
 
             case MSG_ID_HD_SET_SW_CONFIG_RECORD:
                 handleSetHDSoftwareConfigRecord( message );
                 break;
+#endif
 
             case MSG_ID_HD_STOP_RTC_CLOCK:
                 handleStopHDRTCClock( message );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r5c2e890457bce1c56779ad025cf2636a7b4449bf
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5c2e890457bce1c56779ad025cf2636a7b4449bf)
@@ -7151,6 +7151,7 @@
     return result;
 }
 
+#ifndef _RELEASE_
 /*********************************************************************//**
 * @brief
 * The handleGetHDSoftwareConfigRecord function handles a request to get the HD
@@ -7212,6 +7213,7 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
 }
+#endif
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r5c2e890457bce1c56779ad025cf2636a7b4449bf
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5c2e890457bce1c56779ad025cf2636a7b4449bf)
@@ -506,11 +506,13 @@
 // MSG_ID_HD_SEND_SW_CONFIG_RECORD
 BOOL sendHDSWConfigRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* swRcrdAddress );
 
+#ifndef _RELEASE_
 // MSG_ID_HD_GET_SW_CONFIG_RECORD
 void handleGetHDSoftwareConfigRecord( MESSAGE_T *message );
 
 // MSG_ID_HD_SET_SW_CONFIG_RECORD
 void handleSetHDSoftwareConfigRecord( MESSAGE_T *message );
+#endif
 
 // MSG_ID_HD_SEND_USAGE_INFO_RECORD
 BOOL sendHDUsageRecord( U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* sysRcrdAddress );