Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rac55f23681cd3a29ec235265f73c67895e36ada9 -rf4a72f36d8b6ddfc36b987b0a64144b37b8df061
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ac55f23681cd3a29ec235265f73c67895e36ada9)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f4a72f36d8b6ddfc36b987b0a64144b37b8df061)
@@ -39,7 +39,6 @@
 // ********** private function prototypes **********
 
 static void activateAlarm( ALARM_ID_T alarm );
-static BOOL getAlarmActive( U32 alarmID );
 
 /*********************************************************************//**
  * @brief
@@ -90,7 +89,7 @@
     if ( ( alarm > ALARM_ID_NO_ALARM ) && ( alarm < NUM_OF_ALARM_IDS ) )
     {
         // no need to do anything if alarm is already active
-        if ( FALSE == getAlarmActive( alarm ) )
+        if ( FALSE == isAlarmActive( alarm ) )
         {
             // activate alarm
             alarmIsActive[ alarm ].data = TRUE;
@@ -271,44 +270,29 @@
  * The isAlarmActive function determines whether a given alarm is currently active.
  * @details Inputs: alarmIsActive[]
  * @details Outputs: none
- * @param alarmID ID of alarm to check
+ * @param alarm ID of alarm to check
  * @return TRUE if given alarm is active, FALSE if not
- *************************************************************************/
+ *************************************************************************/
 BOOL isAlarmActive( ALARM_ID_T alarm )
 {
-    BOOL result = getAlarmActive( alarm );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getAlarmActive function gets the active state of a given alarm.
- * @details Inputs: alarmIsActive[]
- * @details Outputs: none
- * @param alarmID ID of alarm to check
- * @return TRUE if given alarm is active, FALSE if not
- *************************************************************************/
-static BOOL getAlarmActive( U32 alarmID )
-{
     BOOL result = TRUE;
-    if ( alarmID < NUM_OF_ALARM_IDS )
+    if ( alarm < NUM_OF_ALARM_IDS )
     {
-        if ( OVERRIDE_KEY == alarmIsActive[ alarmID ].override )
+        if ( OVERRIDE_KEY == alarmIsActive[ alarm ].override )
         {
-            result = (BOOL)alarmIsActive[ alarmID ].ovData;
+            result = (BOOL)alarmIsActive[ alarm ].ovData;
         }
         else
         {
-            result = (BOOL)alarmIsActive[ alarmID ].data;
+            result = (BOOL)alarmIsActive[ alarm ].data;
         }
     }
     else
     {
         activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT );
     }
 
-    return result;
+    return result;
 }
 
 /*********************************************************************//**