diff --git a/conf/flight_plans/NS.xml b/conf/flight_plans/NS.xml
deleted file mode 100644
index d83a01d6df..0000000000
--- a/conf/flight_plans/NS.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE flight_plan SYSTEM "flight_plan.dtd">
-
-<flight_plan alt="1900" ground_alt="1780" lat0="42.725089" lon0="1.688210" max_dist_from_home="20000" name="NS" security_height="250">
-  <header>
-#include "nav_line.h"
-#include "datalink.h"
-</header>
-  <waypoints>
-    <waypoint name="HOME" x="0" y="0"/>
-    <waypoint name="BEILLE" x="0" y="-10"/>
-    <waypoint name="STDBY" x="49.5" y="100.1"/>
-    <waypoint alt="2350.0" name="PASS" x="1184.2" y="-11752.8"/>
-    <waypoint alt="2000.0" name="INCLES" x="-289.6" y="-13601.6"/>
-    <waypoint alt="1880.0" name="AF" x="-199.2" y="-13625.7"/>
-    <waypoint alt="1850.0" name="TD" x="-290.0" y="-13621.7"/>
-    <waypoint name="_BASELEG" x="1742.7" y="-13383.7"/>
-    <waypoint name="CLIMB" x="-114.5" y="162.3"/>
-    <waypoint alt="2100.0" name="LAPARAN" x="1530.1" y="-6079.1"/>
-    <waypoint alt="2150.0" name="DESCENT" x="352.6" y="-12433.6"/>
-  </waypoints>
-  <exceptions/>
-  <blocks>
-    <block name="Holding point">
-      <set value="1" var="kill_throttle"/>
-      <attitude roll="0" throttle="0" vmode="throttle"/>
-    </block>
-    <block key="t" name="Takeoff" strip_button="Takeoff (wp CLIMB)" strip_icon="takeoff.png">
-      <exception cond="estimator_z > ground_alt+25" deroute="Standby"/>
-      <set value="0" var="kill_throttle"/>
-      <set value="0" var="estimator_flight_time"/>
-      <go from="HOME" pitch="15" throttle="1.0" vmode="throttle" wp="CLIMB"/>
-    </block>
-    <block key="<Control>a" name="Standby" strip_button="Standby" strip_icon="home.png">
-      <set value="NAV_MODE_COURSE" var="nav_mode"/>
-      <circle radius="nav_radius" wp="STDBY"/>
-    </block>
-    <block name="GO">
-      <go from="BEILLE" hmode="route" wp="LAPARAN"/>
-      <go from="LAPARAN" hmode="route" wp="PASS"/>
-      <go from="PASS" hmode="route" wp="DESCENT"/>
-      <go alt="2100" from="DESCENT" hmode="route" wp="INCLES"/>
-      <circle radius="100" wp="INCLES"/>
-    </block>
-    <block name="Land Right AF-TD" strip_button="Land right (wp AF-TD)" strip_icon="land-right.png">
-      <set value="DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
-      <deroute block="land"/>
-    </block>
-    <block name="Land Left AF-TD" strip_button="Land left (wp AF-TD)" strip_icon="land-left.png">
-      <set value="-DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
-      <deroute block="land"/>
-    </block>
-    <block name="land">
-      <call fun="nav_compute_baseleg(WP_AF, WP_TD, WP__BASELEG, nav_radius)"/>
-      <circle radius="nav_radius" until="NavCircleCount() > 0.5" wp="_BASELEG"/>
-      <circle radius="nav_radius" until="And(NavQdrCloseTo(DegOfRad(baseleg_out_qdr)-10), 10 > fabs(estimator_z - WaypointAlt(WP__BASELEG)))" wp="_BASELEG"/>
-    </block>
-    <block name="final">
-      <exception cond="ground_alt + 10 > estimator_z" deroute="flare"/>
-      <go from="AF" hmode="route" vmode="glide" wp="TD"/>
-    </block>
-    <block name="flare">
-      <go approaching_time="0" from="AF" hmode="route" throttle="0.0" vmode="throttle" wp="TD"/>
-      <attitude roll="0.0" throttle="0.0" until="FALSE" vmode="throttle"/>
-    </block>
-  </blocks>
-</flight_plan>
diff --git a/conf/flight_plans/muret_drop.xml b/conf/flight_plans/muret_drop.xml
deleted file mode 100644
index 6a5b04f344..0000000000
--- a/conf/flight_plans/muret_drop.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<flight_plan alt="255" ground_alt="185" lat0="43.46223" lon0="1.27289" max_dist_from_home="500" name="Basic" security_height="25">
-  <header>
-#include "joystick.h"
-#include "bomb.h"
-#include "nav_line.h"
-#include "datalink.h"
-</header>
-  <rc_control>
-  </rc_control>
-  <waypoints>
-    <waypoint name="HOME" x="15.0" y="5.0"/>
-    <waypoint name="1" x="-181.785735614" y="34.9692539535"/>
-    <waypoint name="2" x="130.143368186" y="90.3661855655"/>
-    <waypoint name="CR" x="0.0885126006" y="73.7359798392"/>
-    <waypoint name="S1" x="-200" y="-200"/>
-    <waypoint name="S2" x="300" y="400"/>
-    <waypoint name="START"    x="140.0" y="35."/>
-    <waypoint name="BASELEG"  x="39.9"  y="-130.3"/>
-    <waypoint name="RELEASE"  x="39.9"  y="-110.3"/>
-    <waypoint name="CLIMB"    x="39.9"  y="-90.3"/>
-    <waypoint name="_BASELEG" x="39.9"  y="-90.3"/>
-    <waypoint alt="215" name="AF"       x="39.9"  y="-90.3"/>
-    <waypoint alt="185"  name="TD"       x="-10."  y="10.3"/>
-    <waypoint alt="185"  name="TARGET"   x="0.9"   y="10.3"/>
-  </waypoints>
-  <blocks>
-    <block NAME="start">
-      <attitude roll="0" pitch="20" vmode="throttle" throttle="0.7" until="(estimator_flight_time > 3)"/>
-      <go wp="START"/>
-    </block>
-    <block NAME="wait" strip_button="wait" strip_icon="home.png">
-      <set value="BombCloseHatch()" var="unit"/>
-      <circle wp="CR" radius="nav_radius"/>
-    </block>
-    <block name="waitshoot" strip_button="wait wing drop" strip_icon="home_drop.png">
-      <set value="BombShoot()" var="unit"/>
-      <circle wp="CR" radius="nav_radius"/>
-      <deroute block="wait"/>
-    </block>
-    <block NAME="east">
-      <go target="2" APPROACHING_TIME="2" HMODE="route" WP="2" from="1"/>
-      <deroute block="west"/>
-    </block>
-    <block NAME="west">
-      <go target="1" APPROACHING_TIME="2" HMODE="route" WP="1" from="2"/>
-      <deroute block="east"/>
-    </block>
-    <block NAME="east t">
-      <go target="2" APPROACHING_TIME="2" PITCH="auto" THROTTLE="0.55" HMODE="route" WP="2" from="1"/>
-      <deroute block="west t"/>
-    </block>
-    <block NAME="west t">
-      <go target="1" APPROACHING_TIME="2" PITCH="auto" THROTTLE="0.55" HMODE="route" WP="1" from="2"/>
-      <deroute block="east t"/>
-    </block>
-    <block name="survey">
-      <survey_rectangle grid="150" wp1="S1" wp2="S2"/>
-    </block>
-    <block name="Line 1-2" strip_button="Line (wp 1-2)" strip_icon="line.png">
-      <set value="BombCloseHatch()" var="unit"/>
-      <call fun="nav_line_init()"/>
-      <call fun="nav_line(WP_1, WP_2, nav_radius)"/>
-    </block>
-    <block name="Line 1-2 wing drop" strip_button="Line drop (wp 1-2)" strip_icon="line_drop.png">
-      <set value="BombShoot()" var="unit"/>
-      <go from="1" hmode="route" wp="2"/>
-      <set value="BombCloseHatch()" var="unit"/>
-      <deroute block="Line 1-2"/>
-    </block>
-    <block name="Oval 1-2" strip_button="Oval (wp 1-2)" strip_icon="oval.png">
-      <oval p1="1" p2="2" radius="nav_radius"/>
-    </block>
-    <block name="Survey S1-S2 NS" strip_button="Survey (wp S1-S2) NS" strip_icon="survey.png">
-      <survey_rectangle grid="150" wp1="S1" wp2="S2"/>
-    </block>
-    <block name="Survey S1-S2 WE" strip_button="Survey (wp S1-S2) WE" strip_icon="survey_we.png">
-      <survey_rectangle grid="150" orientation="WE" wp1="S1" wp2="S2"/>
-    </block>
-    <block name="Figure 8 around wp 1" strip_button="Figure 8 (wp 1-2)" strip_icon="eight.png">
-      <eight center="1" radius="nav_radius" turn_around="2"/>
-    </block>
-
-    <block NAME="down" strip_button="Down" strip_icon="downdown.png">
-     <set var="lateral_mode" value="LATERAL_MODE_ROLL"/>
-     <set var="v_ctl_mode" value="V_CTL_MODE_MANUAL"/>
-     <set value="TRUE" var="h_ctl_disabled"/>
-     <set value="(-0.6*MAX_PPRZ)" var="h_ctl_aileron_setpoint"/>
-     <set value="(0.9*MAX_PPRZ)" var="h_ctl_elevator_setpoint"/>
-     <while cond="estimator_z > ground_alt + 220"/>
-     <set value="0" var="h_ctl_aileron_setpoint"/>
-     <set value="0" var="h_ctl_elevator_setpoint"/>
-     <!--deroute block="down_end"/-->
-    </block>
-    <block NAME="down_end" strip_button="DownEnd" strip_icon="downdownend.png">
-     <set value="0" var="h_ctl_aileron_setpoint"/>
-     <set value="0" var="h_ctl_elevator_setpoint"/>
-     <while cond="1.> stage_time"/>
-     <set value="FALSE" var="h_ctl_disabled"/>
-     <deroute block="wait"/>
-    </block>
-
-    <block name="Land Right AF-TD" strip_button="Land right (wp AF-TD)" strip_icon="land-right.png">
-      <set value="DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
-      <deroute block="land"/>
-    </block>
-    <block name="Land Left AF-TD" strip_button="Land left (wp AF-TD)" strip_icon="land-left.png">
-      <set value="-DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
-      <deroute block="land"/>
-    </block>
-    <block name="land">
-      <call fun="nav_compute_baseleg(WP_AF, WP_TD, WP__BASELEG, nav_radius)"/>
-      <circle radius="nav_radius" until="NavCircleCount() > 0.5" wp="_BASELEG"/>
-      <circle radius="nav_radius" until="NavQdrCloseTo(DegOfRad(baseleg_out_qdr)-10) && 20 > fabs(estimator_z - WaypointAlt(WP__BASELEG))" wp="_BASELEG"/>
-    </block>
-    <block name="final">
-      <exception cond="ground_alt + 10 > estimator_z" deroute="flare"/>
-      <go from="AF" hmode="route" vmode="glide" wp="TD"/>
-    </block>
-    <block name="flare">
-      <go approaching_time="0" from="AF" hmode="route" throttle="0.0" vmode="throttle" wp="TD"/>
-      <attitude roll="0.0" throttle="0.0" until="FALSE" vmode="throttle"/>
-    </block>
-
-  </blocks>
-</flight_plan>