diff --git a/conf/airframes/AirborneCodeReorg/LisaFw.xml b/conf/airframes/AirborneCodeReorg/LisaFw.xml
index 3d277613ee..ee5d66b914 100644
--- a/conf/airframes/AirborneCodeReorg/LisaFw.xml
+++ b/conf/airframes/AirborneCodeReorg/LisaFw.xml
@@ -99,7 +99,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/AirborneCodeReorg/TinyFw.xml b/conf/airframes/AirborneCodeReorg/TinyFw.xml
index d8b34339da..e67e97d6f3 100644
--- a/conf/airframes/AirborneCodeReorg/TinyFw.xml
+++ b/conf/airframes/AirborneCodeReorg/TinyFw.xml
@@ -94,7 +94,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml
index 7810433040..ee2d642f6c 100644
--- a/conf/airframes/ENAC/fixed-wing/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/drops.xml
@@ -126,7 +126,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/ENAC/fixed-wing/firestorm.xml b/conf/airframes/ENAC/fixed-wing/firestorm.xml
index 70b5fda10a..2ffaed1292 100644
--- a/conf/airframes/ENAC/fixed-wing/firestorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/firestorm.xml
@@ -117,7 +117,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
 
     <define name="UNLOCKED_HOME_MODE" value="TRUE"/>
   </section>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet1.xml b/conf/airframes/ENAC/fixed-wing/funjet1.xml
index f7bdd41c18..7f464a7866 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet1.xml
@@ -118,7 +118,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
 
     <define name="UNLOCKED_HOME_MODE" value="TRUE"/>
   </section>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2.xml b/conf/airframes/ENAC/fixed-wing/funjet2.xml
index 133e039df4..3efbffae11 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2.xml
@@ -143,7 +143,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
     
   </section>
 
diff --git a/conf/airframes/ENAC/fixed-wing/merlin.xml b/conf/airframes/ENAC/fixed-wing/merlin.xml
index b26c936250..51ce75f968 100644
--- a/conf/airframes/ENAC/fixed-wing/merlin.xml
+++ b/conf/airframes/ENAC/fixed-wing/merlin.xml
@@ -113,7 +113,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
 
diff --git a/conf/airframes/ENAC/fixed-wing/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
index 8e61f28abf..643e1f63fe 100644
--- a/conf/airframes/ENAC/fixed-wing/solarstorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/solarstorm.xml
@@ -110,7 +110,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
 
     <define name="UNLOCKED_HOME_MODE" value="TRUE"/>
   </section>
diff --git a/conf/airframes/ENAC/fixed-wing/spocII.xml b/conf/airframes/ENAC/fixed-wing/spocII.xml
index 04813a77ca..9bcfcce7f7 100644
--- a/conf/airframes/ENAC/fixed-wing/spocII.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocII.xml
@@ -112,7 +112,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
 
     <define name="UNLOCKED_HOME_MODE" value="TRUE"/>
   </section>
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index 646f131823..8360ee69b9 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -128,7 +128,6 @@
 <!--    <define name="NO_XBEE_API_INIT" value="TRUE"/> -->
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
     <define name="LIGHT_LED_1" value="3"/>
     <define name="LIGHT_LED_2" value="5"/>
   </section>
diff --git a/conf/airframes/ENAC/malolo_sim.xml b/conf/airframes/ENAC/malolo_sim.xml
index e602352182..86367482a9 100644
--- a/conf/airframes/ENAC/malolo_sim.xml
+++ b/conf/airframes/ENAC/malolo_sim.xml
@@ -107,7 +107,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="150."/>
-    <define name="MIN_CIRCLE_RADIUS" value="100."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml b/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
index 6864e153f6..c20d596a19 100644
--- a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
+++ b/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
@@ -83,7 +83,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="90."/>
-    <define name="MIN_CIRCLE_RADIUS" value="60."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/delta_wing_minimal_example.xml b/conf/airframes/delta_wing_minimal_example.xml
index 24fd1e00be..abd39688b6 100644
--- a/conf/airframes/delta_wing_minimal_example.xml
+++ b/conf/airframes/delta_wing_minimal_example.xml
@@ -92,7 +92,6 @@
     <define name="CONTROL_RATE" value="60" unit="Hz"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/demo_module.xml b/conf/airframes/demo_module.xml
index 8e44810c21..e5d7de2015 100644
--- a/conf/airframes/demo_module.xml
+++ b/conf/airframes/demo_module.xml
@@ -88,7 +88,6 @@
     <define name="CONTROL_RATE" value="60" unit="Hz"/>
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/easystar_ets_example.xml b/conf/airframes/easystar_ets_example.xml
index 7222485f11..d5e416d5af 100644
--- a/conf/airframes/easystar_ets_example.xml
+++ b/conf/airframes/easystar_ets_example.xml
@@ -108,7 +108,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="90."/>
-    <define name="MIN_CIRCLE_RADIUS" value="60."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/easystar_example.xml b/conf/airframes/easystar_example.xml
index 5bb00aa163..63613930a8 100644
--- a/conf/airframes/easystar_example.xml
+++ b/conf/airframes/easystar_example.xml
@@ -104,7 +104,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="100."/>
-    <define name="MIN_CIRCLE_RADIUS" value="60."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/funjet_cam_example.xml b/conf/airframes/funjet_cam_example.xml
index b2a7f90d9c..283c40e6c2 100644
--- a/conf/airframes/funjet_cam_example.xml
+++ b/conf/airframes/funjet_cam_example.xml
@@ -121,7 +121,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/funjet_example.xml b/conf/airframes/funjet_example.xml
index fc26836efa..b893d83d94 100644
--- a/conf/airframes/funjet_example.xml
+++ b/conf/airframes/funjet_example.xml
@@ -113,7 +113,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/jsbsim.xml b/conf/airframes/jsbsim.xml
index 2ae2c3a487..02a55f0c4c 100644
--- a/conf/airframes/jsbsim.xml
+++ b/conf/airframes/jsbsim.xml
@@ -106,7 +106,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mentor_tum.xml b/conf/airframes/mentor_tum.xml
index 06ac729a14..546e8fcd31 100644
--- a/conf/airframes/mentor_tum.xml
+++ b/conf/airframes/mentor_tum.xml
@@ -148,7 +148,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="100."/>
-    <define name="MIN_CIRCLE_RADIUS" value="40."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/microjet5.xml b/conf/airframes/microjet5.xml
index 86cd4ddd24..e8789da875 100644
--- a/conf/airframes/microjet5.xml
+++ b/conf/airframes/microjet5.xml
@@ -109,7 +109,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/microjet_raw_makefile.xml b/conf/airframes/microjet_raw_makefile.xml
index b1f24c25c1..38d61277c5 100644
--- a/conf/airframes/microjet_raw_makefile.xml
+++ b/conf/airframes/microjet_raw_makefile.xml
@@ -109,7 +109,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml
index b08969c1a1..13ab9f25eb 100755
--- a/conf/airframes/mm/extra/press_t.xml
+++ b/conf/airframes/mm/extra/press_t.xml
@@ -103,7 +103,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/mm/extra/probe_t.xml
index 3d3d9b0982..129b5e2f9c 100755
--- a/conf/airframes/mm/extra/probe_t.xml
+++ b/conf/airframes/mm/extra/probe_t.xml
@@ -92,7 +92,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/extra/turbine_trigger.xml b/conf/airframes/mm/extra/turbine_trigger.xml
index ec96593f8b..0d75a5c658 100644
--- a/conf/airframes/mm/extra/turbine_trigger.xml
+++ b/conf/airframes/mm/extra/turbine_trigger.xml
@@ -103,7 +103,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/mm/fixed-wing/funjeteth1.xml
index ebf5411a8f..118e228abe 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth1.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth1.xml
@@ -99,7 +99,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/mm/fixed-wing/funjeteth2.xml
index 5464275f4b..3e3de5edfc 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth2.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth2.xml
@@ -99,7 +99,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/fixed-wing/funjetmm.xml b/conf/airframes/mm/fixed-wing/funjetmm.xml
index 9966b5a939..620814de0a 100755
--- a/conf/airframes/mm/fixed-wing/funjetmm.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm.xml
@@ -103,7 +103,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
index 3ff6f6f3c1..9a9c578386 100644
--- a/conf/airframes/mm/fixed-wing/merlin.xml
+++ b/conf/airframes/mm/fixed-wing/merlin.xml
@@ -98,7 +98,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
 
diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/mm/fixed-wing/miniwing.xml
index f7a1b554e5..ce71ac7576 100644
--- a/conf/airframes/mm/fixed-wing/miniwing.xml
+++ b/conf/airframes/mm/fixed-wing/miniwing.xml
@@ -95,7 +95,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="60."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/easystar2.xml b/conf/airframes/obsolete/easystar2.xml
index bdbd557caf..eb4332ab87 100644
--- a/conf/airframes/obsolete/easystar2.xml
+++ b/conf/airframes/obsolete/easystar2.xml
@@ -98,7 +98,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="90."/>
-    <define name="MIN_CIRCLE_RADIUS" value="60."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetfmi1.xml b/conf/airframes/obsolete/funjetfmi1.xml
index 1337da8d48..b420ed8f13 100644
--- a/conf/airframes/obsolete/funjetfmi1.xml
+++ b/conf/airframes/obsolete/funjetfmi1.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi1.xml b/conf/airframes/obsolete/funjetgfi1.xml
index cbcc9efff9..7e953393eb 100644
--- a/conf/airframes/obsolete/funjetgfi1.xml
+++ b/conf/airframes/obsolete/funjetgfi1.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi4.xml b/conf/airframes/obsolete/funjetgfi4.xml
index 1ef790478b..852981c359 100644
--- a/conf/airframes/obsolete/funjetgfi4.xml
+++ b/conf/airframes/obsolete/funjetgfi4.xml
@@ -96,7 +96,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi5.xml b/conf/airframes/obsolete/funjetgfi5.xml
index 124ed43e33..4a32f306fc 100644
--- a/conf/airframes/obsolete/funjetgfi5.xml
+++ b/conf/airframes/obsolete/funjetgfi5.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi6.xml b/conf/airframes/obsolete/funjetgfi6.xml
index ee3ee49778..949af4eb4a 100644
--- a/conf/airframes/obsolete/funjetgfi6.xml
+++ b/conf/airframes/obsolete/funjetgfi6.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi7.xml b/conf/airframes/obsolete/funjetgfi7.xml
index 9b41476513..f340021da8 100644
--- a/conf/airframes/obsolete/funjetgfi7.xml
+++ b/conf/airframes/obsolete/funjetgfi7.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi8.xml b/conf/airframes/obsolete/funjetgfi8.xml
index 971222b956..038601ddd6 100644
--- a/conf/airframes/obsolete/funjetgfi8.xml
+++ b/conf/airframes/obsolete/funjetgfi8.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/funjetgfi9.xml b/conf/airframes/obsolete/funjetgfi9.xml
index aaa85a1ca3..19ff4525c9 100644
--- a/conf/airframes/obsolete/funjetgfi9.xml
+++ b/conf/airframes/obsolete/funjetgfi9.xml
@@ -97,7 +97,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/kalscott_easystar.xml b/conf/airframes/obsolete/kalscott_easystar.xml
index d1e84814b4..a528d3a20c 100644
--- a/conf/airframes/obsolete/kalscott_easystar.xml
+++ b/conf/airframes/obsolete/kalscott_easystar.xml
@@ -85,7 +85,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="100."/>
-    <define name="MIN_CIRCLE_RADIUS" value="60."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/lila.xml b/conf/airframes/obsolete/lila.xml
index 7b35ff5c23..42926a25e9 100644
--- a/conf/airframes/obsolete/lila.xml
+++ b/conf/airframes/obsolete/lila.xml
@@ -109,7 +109,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml
index dc40e7a769..3398a09c8c 100644
--- a/conf/airframes/obsolete/malolo_sim.xml
+++ b/conf/airframes/obsolete/malolo_sim.xml
@@ -106,7 +106,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/microjet5.xml b/conf/airframes/obsolete/microjet5.xml
index 4b4059a709..e7d2167aa2 100644
--- a/conf/airframes/obsolete/microjet5.xml
+++ b/conf/airframes/obsolete/microjet5.xml
@@ -104,7 +104,6 @@
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/miniwing.xml b/conf/airframes/obsolete/miniwing.xml
index ccf21962e7..e1c36ddb58 100644
--- a/conf/airframes/obsolete/miniwing.xml
+++ b/conf/airframes/obsolete/miniwing.xml
@@ -93,7 +93,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="60."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/twinstarmm.xml b/conf/airframes/obsolete/twinstarmm.xml
index fe572fc1dc..8141189ffb 100644
--- a/conf/airframes/obsolete/twinstarmm.xml
+++ b/conf/airframes/obsolete/twinstarmm.xml
@@ -119,7 +119,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
 
diff --git a/conf/airframes/obsolete/tyto1.xml b/conf/airframes/obsolete/tyto1.xml
index 619491c586..5f54570750 100644
--- a/conf/airframes/obsolete/tyto1.xml
+++ b/conf/airframes/obsolete/tyto1.xml
@@ -113,7 +113,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="80."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
   <section name="VERTICAL CONTROL" prefix="V_CTL_">
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
index ff8aa6fe28..80075e1d6e 100644
--- a/conf/airframes/obsolete/xxx1.xml
+++ b/conf/airframes/obsolete/xxx1.xml
@@ -103,7 +103,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="100."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
 
     <define name="UNLOCKED_HOME_MODE" value="TRUE"/>
     <define name="RC_LOST_MODE" value="PPRZ_MODE_AUTO2"/>
diff --git a/conf/airframes/twinstar_example.xml b/conf/airframes/twinstar_example.xml
index d4431a8724..5c2a5ce3f4 100644
--- a/conf/airframes/twinstar_example.xml
+++ b/conf/airframes/twinstar_example.xml
@@ -133,7 +133,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
 
 
diff --git a/conf/airframes/usb_test.xml b/conf/airframes/usb_test.xml
index 6d6a636e60..f6477cae10 100644
--- a/conf/airframes/usb_test.xml
+++ b/conf/airframes/usb_test.xml
@@ -88,7 +88,6 @@
 
     <define name="TRIGGER_DELAY" value="1."/>
     <define name="DEFAULT_CIRCLE_RADIUS" value="120."/>
-    <define name="MIN_CIRCLE_RADIUS" value="50."/>
   </section>
  
   <section name="VERTICAL CONTROL" prefix="V_CTL_">