diff --git a/ArduPlane/config.h b/ArduPlane/config.h
index 9ff92394d3..d1b606f842 100644
--- a/ArduPlane/config.h
+++ b/ArduPlane/config.h
@@ -78,37 +78,6 @@
 //////////////////////////////////////////////////////////////////////////////
 
 
-//////////////////////////////////////////////////////////////////////////////
-// Radio channel limits
-//
-// Note that these are not called out in APM_Config.h.reference.
-//
-#ifndef CH5_MIN
- # define CH5_MIN        1000
-#endif
-#ifndef CH5_MAX
- # define CH5_MAX        2000
-#endif
-#ifndef CH6_MIN
- # define CH6_MIN        1000
-#endif
-#ifndef CH6_MAX
- # define CH6_MAX        2000
-#endif
-#ifndef CH7_MIN
- # define CH7_MIN        1000
-#endif
-#ifndef CH7_MAX
- # define CH7_MAX        2000
-#endif
-#ifndef CH8_MIN
- # define CH8_MIN        1000
-#endif
-#ifndef CH8_MAX
- # define CH8_MAX        2000
-#endif
-
-
 #ifndef FLAP_1_PERCENT
  # define FLAP_1_PERCENT 0
 #endif
@@ -218,14 +187,6 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////
-// Altitude measurement and control.
-//
-#ifndef ALTITUDE_MIX
- # define ALTITUDE_MIX                   1
-#endif
-
-
 //////////////////////////////////////////////////////////////////////////////
 // AIRSPEED_CRUISE
 //
diff --git a/ArduPlane/defines.h b/ArduPlane/defines.h
index 8a18c39c56..47d769653d 100644
--- a/ArduPlane/defines.h
+++ b/ArduPlane/defines.h
@@ -7,7 +7,6 @@
 #define FALSE 0
 
 #define DEBUG 0
-#define LOITER_RANGE 60 // for calculating power outside of loiter radius
 #define SERVO_MAX 4500  // This value represents 45 degrees and is just an
                         // arbitrary representation of servo max travel.
 
@@ -33,17 +32,6 @@ enum gcs_failsafe {
 };
 
 
-// active altitude sensor
-// ----------------------
-#define SONAR 0
-#define BARO 1
-
-#define PITOT_SOURCE_ADC 1
-#define PITOT_SOURCE_ANALOG_PIN 2
-
-#define T6 1000000
-#define T7 10000000
-
 enum FlightMode {
     MANUAL        = 0,
     CIRCLE        = 1,
@@ -158,39 +146,6 @@ enum log_messages {
 #define MASK_LOG_ARM_DISARM             (1<<15)
 #define MASK_LOG_IMU_RAW                (1UL<<19)
 
-// Waypoint Modes
-// ----------------
-#define ABS_WP 0
-#define REL_WP 1
-
-// Command Queues
-// ---------------
-#define COMMAND_MUST 0
-#define COMMAND_MAY 1
-#define COMMAND_NOW 2
-
-// Events
-// ------
-#define EVENT_WILL_REACH_WAYPOINT 1
-#define EVENT_SET_NEW_COMMAND_INDEX 2
-#define EVENT_LOADED_WAYPOINT 3
-#define EVENT_LOOP 4
-
-// Climb rate calculations
-#define ALTITUDE_HISTORY_LENGTH 8       //Number of (time,altitude) points to
-                                        // regress a climb rate from
-
-#define AN4                     4
-#define AN5                     5
-
-#define SPEEDFILT 400                   // centimeters/second; the speed below
-                                        // which a groundstart will be
-                                        // triggered
-
-// convert a boolean (0 or 1) to a sign for multiplying (0 maps to 1, 1 maps
-// to -1)
-#define BOOL_TO_SIGN(bvalue) ((bvalue) ? -1 : 1)
-
 // altitude control algorithms
 enum {
     ALT_CONTROL_DEFAULT      = 0,
@@ -199,12 +154,6 @@ enum {
     ALT_CONTROL_AIRSPEED     = 3
 };
 
-// attitude controller choice
-enum {
-    ATT_CONTROL_PID = 0,
-    ATT_CONTROL_APMCONTROL = 1
-};
-
 enum {
     CRASH_DETECT_ACTION_BITMASK_DISABLED = 0,
     CRASH_DETECT_ACTION_BITMASK_DISARM = (1<<0),