diff --git a/ArduSub/APM_Config.h b/ArduSub/APM_Config.h
index f9690c4f14..7c8523e628 100644
--- a/ArduSub/APM_Config.h
+++ b/ArduSub/APM_Config.h
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 // 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
diff --git a/ArduSub/APM_Config_mavlink_hil.h b/ArduSub/APM_Config_mavlink_hil.h
index 094874b106..dad432892d 100644
--- a/ArduSub/APM_Config_mavlink_hil.h
+++ b/ArduSub/APM_Config_mavlink_hil.h
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 // HIL_MODE SELECTION
 //
 // Mavlink supports
diff --git a/ArduSub/AP_State.cpp b/ArduSub/AP_State.cpp
index 4f505dba20..49b624fc26 100644
--- a/ArduSub/AP_State.cpp
+++ b/ArduSub/AP_State.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // set_home_state - update home state
diff --git a/ArduSub/ArduSub.cpp b/ArduSub/ArduSub.cpp
index b70de2119d..3ebdef9729 100644
--- a/ArduSub/ArduSub.cpp
+++ b/ArduSub/ArduSub.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 /*
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/ArduSub/Attitude.cpp b/ArduSub/Attitude.cpp
index b43468884c..76030a2e16 100644
--- a/ArduSub/Attitude.cpp
+++ b/ArduSub/Attitude.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // get_smoothing_gain - returns smoothing gain to be passed into attitude_control.input_euler_angle_roll_pitch_euler_rate_yaw
diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp
index e663dfda7a..f9660acff7 100644
--- a/ArduSub/GCS_Mavlink.cpp
+++ b/ArduSub/GCS_Mavlink.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 #include "version.h"
 
diff --git a/ArduSub/Log.cpp b/ArduSub/Log.cpp
index e837a66442..a914cca865 100644
--- a/ArduSub/Log.cpp
+++ b/ArduSub/Log.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 #include "version.h"
 
diff --git a/ArduSub/Parameters.cpp b/ArduSub/Parameters.cpp
index a860eef0e9..a101391006 100644
--- a/ArduSub/Parameters.cpp
+++ b/ArduSub/Parameters.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/Parameters.h b/ArduSub/Parameters.h
index 0ceeacf471..3229614798 100644
--- a/ArduSub/Parameters.h
+++ b/ArduSub/Parameters.h
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #pragma once
 
 #include <AP_Common/AP_Common.h>
diff --git a/ArduSub/Sub.cpp b/ArduSub/Sub.cpp
index 0e73f77b9d..e6f2d8da10 100644
--- a/ArduSub/Sub.cpp
+++ b/ArduSub/Sub.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 /*
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h
index d3a6964251..0d587036f4 100644
--- a/ArduSub/Sub.h
+++ b/ArduSub/Sub.h
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 /*
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/ArduSub/UserCode.cpp b/ArduSub/UserCode.cpp
index b19f6038a1..42a11cc1e1 100644
--- a/ArduSub/UserCode.cpp
+++ b/ArduSub/UserCode.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #ifdef USERHOOK_INIT
diff --git a/ArduSub/UserVariables.h b/ArduSub/UserVariables.h
index 6f596218ed..cdd02093d2 100644
--- a/ArduSub/UserVariables.h
+++ b/ArduSub/UserVariables.h
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 // user defined variables
 
 // example variables used in Wii camera testing - replace with your own
diff --git a/ArduSub/arming_checks.cpp b/ArduSub/arming_checks.cpp
index b423bdcf62..9d58809875 100644
--- a/ArduSub/arming_checks.cpp
+++ b/ArduSub/arming_checks.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // performs pre-arm checks. expects to be called at 1hz.
diff --git a/ArduSub/capabilities.cpp b/ArduSub/capabilities.cpp
index 48bc856ab4..76fd7b127c 100644
--- a/ArduSub/capabilities.cpp
+++ b/ArduSub/capabilities.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 void Sub::init_capabilities(void)
diff --git a/ArduSub/commands.cpp b/ArduSub/commands.cpp
index 99e63e1eb7..3ad25be0d4 100644
--- a/ArduSub/commands.cpp
+++ b/ArduSub/commands.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/commands_logic.cpp b/ArduSub/commands_logic.cpp
index a55cd6f92d..41e3cd3cc6 100644
--- a/ArduSub/commands_logic.cpp
+++ b/ArduSub/commands_logic.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // start_command - this function will be called when the ap_mission lib wishes to start a new command
diff --git a/ArduSub/compassmot.cpp b/ArduSub/compassmot.cpp
index f15eb2e1ac..d34f595db4 100644
--- a/ArduSub/compassmot.cpp
+++ b/ArduSub/compassmot.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/config.h b/ArduSub/config.h
index 75c8f09335..795161fd07 100644
--- a/ArduSub/config.h
+++ b/ArduSub/config.h
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-//
 #pragma once
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/ArduSub/control_acro.cpp b/ArduSub/control_acro.cpp
index 26aedeeca4..560781e305 100644
--- a/ArduSub/control_acro.cpp
+++ b/ArduSub/control_acro.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include "Sub.h"
 
 
diff --git a/ArduSub/control_althold.cpp b/ArduSub/control_althold.cpp
index 459d5d2e81..bd82b9225f 100644
--- a/ArduSub/control_althold.cpp
+++ b/ArduSub/control_althold.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include "Sub.h"
 
 
diff --git a/ArduSub/control_auto.cpp b/ArduSub/control_auto.cpp
index 1f848318c4..db64e4c118 100644
--- a/ArduSub/control_auto.cpp
+++ b/ArduSub/control_auto.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/control_autotune.cpp b/ArduSub/control_autotune.cpp
index 64086d4110..1e6dc20876 100644
--- a/ArduSub/control_autotune.cpp
+++ b/ArduSub/control_autotune.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #if AUTOTUNE_ENABLED == ENABLED
diff --git a/ArduSub/control_circle.cpp b/ArduSub/control_circle.cpp
index 28000ade94..42fa01fc1e 100644
--- a/ArduSub/control_circle.cpp
+++ b/ArduSub/control_circle.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/control_guided.cpp b/ArduSub/control_guided.cpp
index e74a8da014..4f5532e149 100644
--- a/ArduSub/control_guided.cpp
+++ b/ArduSub/control_guided.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/control_manual.cpp b/ArduSub/control_manual.cpp
index 838b973b70..a467ad9f4f 100644
--- a/ArduSub/control_manual.cpp
+++ b/ArduSub/control_manual.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include "Sub.h"
 
 // manual_init - initialise manual controller
diff --git a/ArduSub/control_poshold.cpp b/ArduSub/control_poshold.cpp
index 2566ea1ba5..ed8e309a35 100644
--- a/ArduSub/control_poshold.cpp
+++ b/ArduSub/control_poshold.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 // ArduSub position hold flight mode
 // GPS required
 // Jacob Walser August 2016
diff --git a/ArduSub/control_stabilize.cpp b/ArduSub/control_stabilize.cpp
index c7294a1290..9bcca28bd4 100644
--- a/ArduSub/control_stabilize.cpp
+++ b/ArduSub/control_stabilize.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // stabilize_init - initialise stabilize controller
diff --git a/ArduSub/control_transect.cpp b/ArduSub/control_transect.cpp
index 945176bd46..53d328ff4c 100644
--- a/ArduSub/control_transect.cpp
+++ b/ArduSub/control_transect.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 // ArduSub transect flight mode
 // Sub follows a line according to current crosstrack error supplied by XTE NMEA sentence
 // Requires GPS providing crosstrack error
diff --git a/ArduSub/control_velhold.cpp b/ArduSub/control_velhold.cpp
index 469dd3d0f1..28aa996167 100644
--- a/ArduSub/control_velhold.cpp
+++ b/ArduSub/control_velhold.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 // ArduSub velocity hold flight mode
 // Pilot adjusts desired forward and lateral body-frame velocities
 // Position controller maintains desired velocities
diff --git a/ArduSub/crash_check.cpp b/ArduSub/crash_check.cpp
index 261c8c01f6..febee37070 100644
--- a/ArduSub/crash_check.cpp
+++ b/ArduSub/crash_check.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // Code to detect a crash main ArduCopter code
diff --git a/ArduSub/defines.h b/ArduSub/defines.h
index 59bb0a5422..0852738a90 100644
--- a/ArduSub/defines.h
+++ b/ArduSub/defines.h
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #pragma once
 
 #include <AP_HAL/AP_HAL_Boards.h>
diff --git a/ArduSub/ekf_check.cpp b/ArduSub/ekf_check.cpp
index fed63debd5..c4b8f407ea 100644
--- a/ArduSub/ekf_check.cpp
+++ b/ArduSub/ekf_check.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /**
diff --git a/ArduSub/esc_calibration.cpp b/ArduSub/esc_calibration.cpp
index 4d71865741..529a77ec02 100644
--- a/ArduSub/esc_calibration.cpp
+++ b/ArduSub/esc_calibration.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*****************************************************************************
diff --git a/ArduSub/events.cpp b/ArduSub/events.cpp
index 2da6194d4c..0f43baf0be 100644
--- a/ArduSub/events.cpp
+++ b/ArduSub/events.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 void Sub::failsafe_battery_event(void)
diff --git a/ArduSub/failsafe.cpp b/ArduSub/failsafe.cpp
index a2a873be0a..3b14e980e0 100644
--- a/ArduSub/failsafe.cpp
+++ b/ArduSub/failsafe.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 //
diff --git a/ArduSub/fence.cpp b/ArduSub/fence.cpp
index 20ba4794fe..f23736bb6c 100644
--- a/ArduSub/fence.cpp
+++ b/ArduSub/fence.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // Code to integrate AC_Fence library with main ArduCopter code
diff --git a/ArduSub/flight_mode.cpp b/ArduSub/flight_mode.cpp
index f20b2b0ea0..b43c06cebd 100644
--- a/ArduSub/flight_mode.cpp
+++ b/ArduSub/flight_mode.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/inertia.cpp b/ArduSub/inertia.cpp
index cb4301219c..85ced29853 100644
--- a/ArduSub/inertia.cpp
+++ b/ArduSub/inertia.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // read_inertia - read inertia in from accelerometers
diff --git a/ArduSub/joystick.cpp b/ArduSub/joystick.cpp
index e7582eaf66..643db45243 100644
--- a/ArduSub/joystick.cpp
+++ b/ArduSub/joystick.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // Functions that will handle joystick/gamepad input
diff --git a/ArduSub/leds.cpp b/ArduSub/leds.cpp
index 6c5dec24de..45e08120ea 100644
--- a/ArduSub/leds.cpp
+++ b/ArduSub/leds.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 
diff --git a/ArduSub/motor_test.cpp b/ArduSub/motor_test.cpp
index ebcbb9285f..de0f4270d3 100644
--- a/ArduSub/motor_test.cpp
+++ b/ArduSub/motor_test.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 /*
diff --git a/ArduSub/motors.cpp b/ArduSub/motors.cpp
index 1286f45a6e..1a7fc4c718 100644
--- a/ArduSub/motors.cpp
+++ b/ArduSub/motors.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #define ARM_DELAY               20  // called at 10hz so 2 seconds
diff --git a/ArduSub/navigation.cpp b/ArduSub/navigation.cpp
index a948798b6d..f458686cc3 100644
--- a/ArduSub/navigation.cpp
+++ b/ArduSub/navigation.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // run_nav_updates - top level call for the autopilot
diff --git a/ArduSub/perf_info.cpp b/ArduSub/perf_info.cpp
index d6ce32602b..d6af585bf2 100644
--- a/ArduSub/perf_info.cpp
+++ b/ArduSub/perf_info.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 //
diff --git a/ArduSub/position_vector.cpp b/ArduSub/position_vector.cpp
index ea641d820b..4e9313fb6f 100644
--- a/ArduSub/position_vector.cpp
+++ b/ArduSub/position_vector.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // position_vector.pde related utility functions
diff --git a/ArduSub/radio.cpp b/ArduSub/radio.cpp
index c8cd05e886..e284c133ac 100644
--- a/ArduSub/radio.cpp
+++ b/ArduSub/radio.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 
diff --git a/ArduSub/sensors.cpp b/ArduSub/sensors.cpp
index 63e7487f9e..44b64a5d15 100644
--- a/ArduSub/sensors.cpp
+++ b/ArduSub/sensors.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 void Sub::init_barometer(bool full_calibration)
diff --git a/ArduSub/setup.cpp b/ArduSub/setup.cpp
index c913c348ea..1e0c141c0a 100644
--- a/ArduSub/setup.cpp
+++ b/ArduSub/setup.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #if CLI_ENABLED == ENABLED
diff --git a/ArduSub/surface_bottom_detector.cpp b/ArduSub/surface_bottom_detector.cpp
index 4a7b4236d0..274851e796 100644
--- a/ArduSub/surface_bottom_detector.cpp
+++ b/ArduSub/surface_bottom_detector.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 // Jacob Walser: jacob@bluerobotics.com
 
 #include "Sub.h"
diff --git a/ArduSub/switches.cpp b/ArduSub/switches.cpp
index 508d92c310..5c36daf20c 100644
--- a/ArduSub/switches.cpp
+++ b/ArduSub/switches.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #define CONTROL_SWITCH_DEBOUNCE_TIME_MS  200
diff --git a/ArduSub/system.cpp b/ArduSub/system.cpp
index 9ecb6ae005..11ba0c5bba 100644
--- a/ArduSub/system.cpp
+++ b/ArduSub/system.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 #include "version.h"
 
diff --git a/ArduSub/terrain.cpp b/ArduSub/terrain.cpp
index 1d01201d1f..bb35ba31fb 100644
--- a/ArduSub/terrain.cpp
+++ b/ArduSub/terrain.cpp
@@ -1,5 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 // update terrain data
diff --git a/ArduSub/test.cpp b/ArduSub/test.cpp
index 7f8948f170..ea0b439b61 100644
--- a/ArduSub/test.cpp
+++ b/ArduSub/test.cpp
@@ -1,5 +1,3 @@
-// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
-
 #include "Sub.h"
 
 #if CLI_ENABLED == ENABLED
diff --git a/ArduSub/tuning.cpp b/ArduSub/tuning.cpp
index 2e4688c489..e4ddeac560 100644
--- a/ArduSub/tuning.cpp
+++ b/ArduSub/tuning.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 #include "Sub.h"
 #if CH6_TUNE_ENABLED == ENABLED
 
diff --git a/ArduSub/turn_counter.cpp b/ArduSub/turn_counter.cpp
index 4fc4289dc0..c257d8f3c2 100644
--- a/ArduSub/turn_counter.cpp
+++ b/ArduSub/turn_counter.cpp
@@ -1,4 +1,3 @@
-/// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
 // Code by Rustom Jehangir: rusty@bluerobotics.com
 
 #include "Sub.h"