diff --git a/Tools/Frame_params/EFlight_Convergence.param b/Tools/Frame_params/EFlight_Convergence.param
index ae2041f9ce..57c7e354a9 100644
--- a/Tools/Frame_params/EFlight_Convergence.param
+++ b/Tools/Frame_params/EFlight_Convergence.param
@@ -5,7 +5,6 @@ BATT_CAPACITY,2200
 BATT_MONITOR,4
 BATT_VOLT_MULT,12
 BRD_SAFETYENABLE,0
-ELEVON_OUTPUT,3
 FORMAT_VERSION,13
 LIM_PITCH_MAX,3500
 MIXING_GAIN,0.8
diff --git a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
index 26ff771952..0392f67f76 100644
--- a/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
+++ b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
@@ -9,7 +9,9 @@ AUTOTUNE_LEVEL   7
 BATT_MONITOR     6
 BATT_CAPACITY    2700
 COMPASS_CAL_FIT  20
-ELEVON_OUTPUT    6
+SERVO1_FUNCTION  77
+SERVO2_FUNCTION  78
+SERVO2_REVERSED  1
 FLTMODE1         10
 FLTMODE2         11
 FLTMODE3         12
@@ -61,3 +63,4 @@ WP_RADIUS        90
 STICK_MIXING     0
 THROTTLE_NUDGE   0
 SCHED_LOOP_RATE  200
+SERVO_AUTO_TRIM  1
diff --git a/Tools/autotest/default_params/vee-gull 005.param b/Tools/autotest/default_params/vee-gull 005.param
index b569a3e997..0d80a9dfa8 100644
--- a/Tools/autotest/default_params/vee-gull 005.param	
+++ b/Tools/autotest/default_params/vee-gull 005.param	
@@ -178,11 +178,6 @@ EK2_WIND_PSCALE,0.5
 EK2_YAW_I_GATE,300
 EK2_YAW_M_NSE,0.5
 EK3_ENABLE,0
-ELEVON_CH1_REV,0
-ELEVON_CH2_REV,0
-ELEVON_MIXING,0
-ELEVON_OUTPUT,0
-ELEVON_REVERSE,0
 FBWA_TDRAG_CHAN,0
 FBWB_CLIMB_RATE,2
 FBWB_ELEV_REV,0
@@ -886,7 +881,6 @@ TUNE_PARAM,0
 TUNE_RANGE,2
 TUNE_SELECTOR,0
 USE_REV_THRUST,2
-VTAIL_OUTPUT,0
 WP_LOITER_RAD,60
 WP_MAX_RADIUS,0
 WP_RADIUS,90