diff --git a/ArduSub/APM_Config.h b/ArduSub/APM_Config.h
deleted file mode 100644
index 3b1a50470d..0000000000
--- a/ArduSub/APM_Config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// User specific config file.  Any items listed in config.h can be overridden here.
-
-// If you used to define your CONFIG_APM_HARDWARE setting here, it is no longer
-// valid! You should switch to using a HAL_BOARD flag in your local config.mk.
-
-// uncomment the lines below to disable features (flash sizes listed are for APM2 boards and will underestimate savings on Pixhawk and other boards)
-//#define LOGGING_ENABLED       DISABLED            // disable logging to save 11K of flash space
-//#define MOUNT                 DISABLED            // disable the camera gimbal to save 8K of flash space
-//#define AC_FENCE              DISABLED            // disable fence to save 2k of flash
-//#define CAMERA                DISABLED            // disable camera trigger to save 1k of flash
-//#define RANGEFINDER_ENABLED   DISABLED            // disable rangefinder to save 1k of flash
-//#define POSHOLD_ENABLED       DISABLED            // disable PosHold flight mode to save 4.5k of flash
-//#define NAV_GUIDED            DISABLED            // disable external navigation computer ability to control vehicle through MAV_CMD_NAV_GUIDED mission commands
-
-// features below are disabled by default on all boards
-//#define GRIPPER_ENABLED       ENABLED            // enable gripper library
-//#define AVOIDANCE_ENABLED     ENABLED
-//#define PROXIMITY_ENABLED     ENABLED
-//#define AC_RALLY              ENABLED            // enable rally points library
-//#define AC_TERRAIN            ENABLED            // enable terrain library (Must also enable Rally)
-//#define OPTFLOW               ENABLED // enable optical flow sensor support
-
-// User Hooks : For User Developed code that you wish to run
-// Put your variable definitions into the UserVariables.h file (or another file name and then change the #define below).
-//#define USERHOOK_VARIABLES "UserVariables.h"
-// Put your custom code into the UserCode.pde with function names matching those listed below and ensure the appropriate #define below is uncommented below
-//#define USERHOOK_INIT userhook_init();                      // for code to be run once at startup
-//#define USERHOOK_FASTLOOP userhook_FastLoop();            // for code to be run at 100hz
-//#define USERHOOK_50HZLOOP userhook_50Hz();                  // for code to be run at 50hz
-//#define USERHOOK_MEDIUMLOOP userhook_MediumLoop();        // for code to be run at 10hz
-//#define USERHOOK_SLOWLOOP userhook_SlowLoop();            // for code to be run at 3.3hz
-//#define USERHOOK_SUPERSLOWLOOP userhook_SuperSlowLoop();  // for code to be run at 1hz
diff --git a/ArduSub/config.h b/ArduSub/config.h
index 231d6a12bd..d41188e700 100644
--- a/ArduSub/config.h
+++ b/ArduSub/config.h
@@ -1,33 +1,7 @@
 #pragma once
 
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-//
-//  DO NOT EDIT this file to adjust your configuration.  Create your own
-//  APM_Config.h and use APM_Config.h.example as a reference.
-//
-// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-///
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//
-// Default and automatic configuration details.
-//
-// Notes for maintainers:
-//
-// - Try to keep this file organised in the same order as APM_Config.h.example
-//
 #include "defines.h"
 
-///
-/// DO NOT EDIT THIS INCLUDE - if you want to make a local change, make that
-/// change in your local copy of APM_Config.h.
-///
-#include "APM_Config.h" // <== THIS INCLUDE, DO NOT EDIT IT. EVER.
-
-
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 // HARDWARE CONFIGURATION AND CONNECTIONS