Index: firmware/App/Services/AlarmMgmtDD.c
===================================================================
diff -u -r8b8fff67b95805272f37855346d600599aaec03d -rcd3af1ebb7396ba3b2bec1d779510d29c30014f4
--- firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision 8b8fff67b95805272f37855346d600599aaec03d)
+++ firmware/App/Services/AlarmMgmtDD.c	(.../AlarmMgmtDD.c)	(revision cd3af1ebb7396ba3b2bec1d779510d29c30014f4)
@@ -15,8 +15,6 @@
 *
 ***************************************************************************/
 
-
-#include "SystemCommDD.h"
 #include "AlarmMgmtDD.h"
 //#include "CPLD.h"
 #include "OperationModes.h"
@@ -27,6 +25,7 @@
 #include "Timers.h"
 #include "Messaging.h"
 #include "TDDefs.h"
+#include "SystemCommDD.h"
 
 /**
  *  @addtogroup AlarmManagement
@@ -128,7 +127,7 @@
                 if ( TRUE == isTransitionToFaultRequired() )
                 {
                     // If alarm is a DG fault and the alarm manager can transition to fault immediately, go to fault mode
-                    requestNewOperationMode( DG_MODE_FAUL );
+                    requestNewOperationMode( DD_MODE_FAUL );
                 }
             }
         }
@@ -335,12 +334,12 @@
     BOOL status = FALSE;
 
     // Check all the inlet water conditions
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH );
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW );
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH );
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW );
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH );
-    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_HIGH );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH );
+//    status |= isAlarmActive( ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW );
 
     return status;
 }
@@ -356,17 +355,17 @@
 static BOOL isTransitionToFaultRequired( void )
 {
     BOOL status         = TRUE;
-    DG_OP_MODE_T opMode = getCurrentOperationMode();
+    DD_OP_MODE_T opMode = getCurrentOperationMode();
 
     switch( opMode )
     {
-        case DG_MODE_FLUS:
-        case DG_MODE_HEAT:
-        case DG_MODE_CHEM:
-        case DG_MODE_SERV:
-        case DG_MODE_CHFL:
-        case DG_MODE_HCOL:
-        case DG_MODE_ROPS:
+        //case DG_MODE_FLUS:
+        case DD_MODE_HEAT:
+        //case DG_MODE_CHEM:
+        case DD_MODE_SERV:
+        //case DG_MODE_CHFL:
+        case DD_MODE_HCOL:
+        case DD_MODE_ROPS:
             status = FALSE;
             break;