diff --git a/ArduCopter/APM_Config.h b/ArduCopter/APM_Config.h
index df0a080170..8007fd2a4d 100644
--- a/ArduCopter/APM_Config.h
+++ b/ArduCopter/APM_Config.h
@@ -25,7 +25,7 @@
 	V_FRAME
 	*/
 
-# define CH7_OPTION		CH7_SAVE_WP
+//# define CH7_OPTION		CH7_SAVE_WP
 	/*
 	CH7_DO_NOTHING
 	CH7_SET_HOVER
@@ -39,9 +39,6 @@
 
 #define ACCEL_ALT_HOLD 0		// disabled by default, work in progress
 
-// lets use Manual throttle during Loiter
-//#define LOITER_THR			THROTTLE_MANUAL
-# define RTL_YAW 			YAW_HOLD
 
 //#define RATE_ROLL_I 	0.18
 //#define RATE_PITCH_I	0.18
@@ -68,6 +65,4 @@
 // #define CONFIG_APM_HARDWARE APM_HARDWARE_APM2
 // #define APM2_BETA_HARDWARE  // for developers who received an early beta board with the older BMP085
 
-
-// This is experimental!!, be caureful, effects stable mode
-#define WIND_COMP_STAB 0
\ No newline at end of file
+//# define LOGGING_ENABLED		DISABLED
\ No newline at end of file