Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r51f2f8f4adf8963e19e5f746b16c54ae814d73c0 -r5e27b15cb308689032898c2c246adce2bd7a55de
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 51f2f8f4adf8963e19e5f746b16c54ae814d73c0)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 5e27b15cb308689032898c2c246adce2bd7a55de)
@@ -124,11 +124,6 @@
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_TEMPERATURE_SENSORS_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE,
-    SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE,
-    SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE,
-    SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
     SW_FAULT_ID_VALVES_INVALID_VALVE_STATE_NAME,
     SW_FAULT_ID_VALVES_INVALID_VALVE_ID,
     NUM_OF_SW_FAULT_IDS