Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r173e5908bada098006b85c1267147a187d2eaef4 -re5d24f913e4f29d61c813cd1446ac22a368815f2
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 173e5908bada098006b85c1267147a187d2eaef4)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision e5d24f913e4f29d61c813cd1446ac22a368815f2)
@@ -7,8 +7,8 @@
 *
 * @file    WatchdogMgmt.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      17-Oct-2022
+* @author  (last)      Sean Nash
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -158,7 +158,6 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
-#ifndef DISABLE_WD_AND_SFTY_POST_TESTS
     switch ( watchdogSelfTestState )
     {
         case WATCHDOG_SELF_TEST_STATE_START:
@@ -249,10 +248,6 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_WATCHDOG_INVALID_SELF_TEST_STATE, watchdogSelfTestState )
             break;
     }
-#else
-    watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED;
-    result = watchdogSelfTestStatus;
-#endif
 
     return result;
 }