diff --git a/ArduCopterMega/APM_Config.h b/ArduCopterMega/APM_Config.h
index 3da60ca4cf..6e97c8a941 100644
--- a/ArduCopterMega/APM_Config.h
+++ b/ArduCopterMega/APM_Config.h
@@ -7,21 +7,19 @@
 
 //#define MAGORIENTATION	AP_COMPASS_COMPONENTS_UP_PINS_BACK
 //#define MAGORIENTATION	AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
-
-#define MAGORIENTATION	AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
-#define ARM_AT_STARTUP	0
+#define MAGORIENTATION		AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
 
 
 // For future development, don't enable unless you know them
 // These are all experimental and underwork, jp 23-12-10
-#define ENABLE_EXTRAS     ENABLED
-#define ENABLE_EXTRAINIT  ENABLED
+//#define ENABLE_EXTRAS     ENABLED
+//#define ENABLE_EXTRAINIT  ENABLED
 //#define ENABLE_CAM        ENABLED
-#define ENABLE_AM         ENABLED
+//#define ENABLE_AM         ENABLED
 //#define ENABLE_xx         ENABLED
 
-
+ 
 // Logging
-#define LOG_CURRENT ENABLED
+//#define LOG_CURRENT ENABLED