Index: firmware/App/DGCommon.h
===================================================================
diff -u -r49d48d9a9354c7cd2437d77a236a8d91d4a15d50 -r3e9328290bdbc18a940935bd7f7c720ca8432b1d
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 49d48d9a9354c7cd2437d77a236a8d91d4a15d50)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 3e9328290bdbc18a940935bd7f7c720ca8432b1d)
@@ -36,13 +36,10 @@
 //    #define TASK_TIMING_OUTPUT_ENABLED      1            // Build switch   // re-purposes drain pump enable pin for task timing
     #define DISABLE_ACK_ALARM 1                            // Build switch
     #define THD_USING_TRO_CONNECTOR         1              // Build switch
-    #define DISABLE_COND_STATUS_CHECK       1              // Build switch
 //    #define EMC_TEST_BUILD                  1            // Build switch
 
-    #define DISABLE_RTC_CONFIG              1              // Not needed  TODO investigate and remove
+    #define DISABLE_FPGA_ALARMS_UNTIL_THE_NEW_PERSISTENT
 
-//    #define ENABLE_DVT_BOARD                1              // TODo can we make this a sw config?
-
     #include <stdio.h>
     #include <strings.h>
 #endif