Index: firmware/App/DGCommon.h
===================================================================
diff -u -rc0160362dc799802ec589d5b6cf4c2bd1face77e -r97e0100921ccad633b39b509a93a7237e4d80446
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision c0160362dc799802ec589d5b6cf4c2bd1face77e)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 97e0100921ccad633b39b509a93a7237e4d80446)
@@ -33,14 +33,12 @@
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
-    #define DONT_SKIP_NV_POST               1
 //    #define SIMULATE_UI                     1
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
 //    #define DISABLE_HEATERS_AND_TEMPS       1
 //    #define DISABLE_ACCELS                  1
 //    #define SKIP_POST                       1
-    #define DISABLE_CAL_CHECK               1
-    #define IGNORE_CAL_TIMESTAMP            1
+    #define SKIP_CAL_CHECK               1
 //    #define ENABLE_DIP_SWITCHES             1
 //    #define EMC_TEST_BUILD                  1
     #define ALARMS_DEBUG                    1