diff --git a/conf/airframes/Poine/antenna.xml b/conf/airframes/obsolete/Poine/antenna.xml
similarity index 100%
rename from conf/airframes/Poine/antenna.xml
rename to conf/airframes/obsolete/Poine/antenna.xml
diff --git a/conf/airframes/Poine/beth.xml b/conf/airframes/obsolete/Poine/beth.xml
similarity index 100%
rename from conf/airframes/Poine/beth.xml
rename to conf/airframes/obsolete/Poine/beth.xml
diff --git a/conf/airframes/Poine/bl_mc.xml b/conf/airframes/obsolete/Poine/bl_mc.xml
similarity index 100%
rename from conf/airframes/Poine/bl_mc.xml
rename to conf/airframes/obsolete/Poine/bl_mc.xml
diff --git a/conf/airframes/Poine/booz2_a1.xml b/conf/airframes/obsolete/Poine/booz2_a1.xml
similarity index 100%
rename from conf/airframes/Poine/booz2_a1.xml
rename to conf/airframes/obsolete/Poine/booz2_a1.xml
diff --git a/conf/airframes/Poine/booz2_a7.xml b/conf/airframes/obsolete/Poine/booz2_a7.xml
similarity index 100%
rename from conf/airframes/Poine/booz2_a7.xml
rename to conf/airframes/obsolete/Poine/booz2_a7.xml
diff --git a/conf/airframes/Poine/booz2_a8.xml b/conf/airframes/obsolete/Poine/booz2_a8.xml
similarity index 100%
rename from conf/airframes/Poine/booz2_a8.xml
rename to conf/airframes/obsolete/Poine/booz2_a8.xml
diff --git a/conf/airframes/Poine/easy_glider1.xml b/conf/airframes/obsolete/Poine/easy_glider1.xml
similarity index 100%
rename from conf/airframes/Poine/easy_glider1.xml
rename to conf/airframes/obsolete/Poine/easy_glider1.xml
diff --git a/conf/airframes/Poine/funjet42.xml b/conf/airframes/obsolete/Poine/funjet42.xml
similarity index 100%
rename from conf/airframes/Poine/funjet42.xml
rename to conf/airframes/obsolete/Poine/funjet42.xml
diff --git a/conf/airframes/Poine/h_hex.xml b/conf/airframes/obsolete/Poine/h_hex.xml
similarity index 100%
rename from conf/airframes/Poine/h_hex.xml
rename to conf/airframes/obsolete/Poine/h_hex.xml
diff --git a/conf/airframes/Poine/motor_bench.xml b/conf/airframes/obsolete/Poine/motor_bench.xml
similarity index 100%
rename from conf/airframes/Poine/motor_bench.xml
rename to conf/airframes/obsolete/Poine/motor_bench.xml
diff --git a/conf/airframes/Poine/pt_ant.xml b/conf/airframes/obsolete/Poine/pt_ant.xml
similarity index 100%
rename from conf/airframes/Poine/pt_ant.xml
rename to conf/airframes/obsolete/Poine/pt_ant.xml
diff --git a/conf/airframes/Poine/swift_1.xml b/conf/airframes/obsolete/Poine/swift_1.xml
similarity index 100%
rename from conf/airframes/Poine/swift_1.xml
rename to conf/airframes/obsolete/Poine/swift_1.xml
diff --git a/conf/airframes/Poine/test_libeknav.xml b/conf/airframes/obsolete/Poine/test_libeknav.xml
similarity index 100%
rename from conf/airframes/Poine/test_libeknav.xml
rename to conf/airframes/obsolete/Poine/test_libeknav.xml
diff --git a/conf/airframes/Poine/test_settings.xml b/conf/airframes/obsolete/Poine/test_settings.xml
similarity index 100%
rename from conf/airframes/Poine/test_settings.xml
rename to conf/airframes/obsolete/Poine/test_settings.xml
diff --git a/conf/conf.xml.adelaide b/conf/conf.xml.adelaide
deleted file mode 100644
index 5d237df3ee..0000000000
--- a/conf/conf.xml.adelaide
+++ /dev/null
@@ -1,32 +0,0 @@
-<conf>
-  <aircraft
-   name="A1000_BOOZ"
-   ac_id="2"
-   airframe="airframes/UofAdelaide/A1000_BOOZ.xml"
-   radio="radios/eric_PCM9XwAR7000.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_ahrs_cmpl.xml"
-   gui_color="blue"
-  />
-  <aircraft
-   name="A1000_LISA"
-   ac_id="1"
-   airframe="airframes/UofAdelaide/A1000_LISA.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml"
-   gui_color="blue"
-  />
-  <aircraft
-   name="A1000_NOVA"
-   ac_id="3"
-   airframe="airframes/UofAdelaide/A1000_NOVA.xml"
-   radio="radios/eric_DX7wAR7000.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_ahrs_cmpl.xml"
-   gui_color="blue"
-  />
-</conf>
diff --git a/conf/conf.xml.nova b/conf/conf.xml.nova
deleted file mode 100644
index 7dfaa97ecc..0000000000
--- a/conf/conf.xml.nova
+++ /dev/null
@@ -1,92 +0,0 @@
-<conf>
-  <aircraft
-   name="BOOZ2_A1"
-   ac_id="150"
-   airframe="airframes/booz2_a1.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_ahrs_cmpl.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="BOOZ2_A2"
-   ac_id="151"
-   airframe="airframes/booz2_a2.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_fms_ts.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="BOOZ2_ARON"
-   ac_id="153"
-   airframe="airframes/booz2_Aron.xml"
-   radio="radios/aron.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_fms_ts.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="BOOZ2_NOVA"
-   ac_id="152"
-   airframe="airframes/booz2_NoVa.xml"
-   radio="radios/T7chp.xml"
-   telemetry="telemetry/telemetry_booz2.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/settings_booz2.xml settings/settings_booz2_fms_ts.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="CSC"
-   ac_id="13"
-   airframe="airframes/csc.xml"
-   radio="radios/jrxp9303.xml"
-   telemetry="telemetry/csc.xml"
-   flight_plan="flight_plans/dummy.xml"
-   settings="settings/basic.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="DM"
-   ac_id="8"
-   airframe="airframes/demo_module.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default.xml"
-   flight_plan="flight_plans/demo_module.xml"
-   settings="settings/basic.xml"
-   gui_color="white"
-  />
-  <aircraft
-   name="HITL"
-   ac_id="7"
-   airframe="airframes/tiny_hitl.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/hitl.xml"
-   flight_plan="flight_plans/basic.xml"
-   settings="settings/basic.xml"
-   gui_color="blue"
-  />
-  <aircraft
-   name="MJ5"
-   ac_id="5"
-   airframe="airframes/microjet5.xml"
-   radio="radios/cockpitMM.xml"
-   telemetry="telemetry/default.xml"
-   flight_plan="flight_plans/basic.xml"
-   settings="settings/basic.xml"
-   gui_color="#6293ba"
-  />
-  <aircraft
-   name="TJ1"
-   ac_id="6"
-   airframe="airframes/twinjet1.xml"
-   radio="radios/cockpitMM.xml"
-   telemetry="telemetry/default.xml"
-   flight_plan="flight_plans/versatile.xml"
-   settings="settings/tuning.xml"
-   gui_color="#ba6293"
-  />
-</conf>
diff --git a/conf/control_panel.xml.adelaide b/conf/control_panel.xml.adelaide
deleted file mode 100644
index ee3a5064a6..0000000000
--- a/conf/control_panel.xml.adelaide
+++ /dev/null
@@ -1,199 +0,0 @@
-<control_panel name="paparazzi control panel">
-  <section name="variables">
-    <variable name="downlink_serial_port" value="/dev/ttyUSB0"/>
-    <variable name="fbw_serial_port" value="/dev/ttyS1"/>
-    <variable name="ap_serial_port" value="/dev/ttyS0"/>
-    <variable name="ivy_bus" value="127:2010"/>
-    <variable name="map" value="muret_UTM.xml"/>
-    <variable name="flight_plan" value="flight_plans/muret1.xml"/>
-  </section>
-  <section name="programs">
-    <program name="Server" command="sw/ground_segment/tmtc/server">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Data Link" command="sw/ground_segment/tmtc/link">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="GCS" command="sw/ground_segment/cockpit/gcs">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Flight Plan Editor" command="sw/ground_segment/cockpit/gcs -edit"/>
-    <program name="Messages" command="sw/ground_segment/tmtc/messages">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Messages (Python)" command="sw/ground_segment/python/messages_app/messagesapp.py"/>
-    <program name="Settings" command="sw/ground_segment/tmtc/settings">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Settings (Python)" command="sw/ground_segment/python/settings_app/settingsapp.py"/>
-    <program name="GPSd position display" command="sw/ground_segment/tmtc/gpsd2ivy"/>
-    <program name="Log Plotter" command="sw/logalizer/plot"/>
-    <program name="Real-time Plotter" command="sw/logalizer/plotter"/>
-    <program name="Log File Player" command="sw/logalizer/play">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Simulator" command="sw/simulator/launchsitl">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Hardware in the Loop" command="sw/simulator/simhitl">
-      <arg flag="-fbw" variable="fbw_serial_port"/>
-      <arg flag="-ap" variable="ap_serial_port"/>
-    </program>
-    <program name="Environment Simulator" command="sw/simulator/gaia">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-    <program name="Http Server" command="sw/ground_segment/tmtc/boa"/>
-  </section>
-  <section name="sessions">
-    <session name="BoozSimulation">
-      <program name="GCS"/>
-      <program name="Server">
-        <arg flag="-n"/>
-      </program>
-      <program name="Simulator">
-        <arg flag="-a" constant="BOOZ2_A1"/>
-        <arg flag="--js_dev" constant="/dev/input/js1"/>
-        <arg flag="--fg_host" constant="127.0.0.1"/>
-      </program>
-    </session>
-    <session name="Flight USB@57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyUSB0"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-      <program name="Messages"/>
-    </session>
-    <session name="HITL">
-      <program name="Hardware in the Loop">
-        <arg flag="-a" constant="HITL"/>
-        <arg flag="-noground"/>
-        <arg flag="-boot"/>
-      </program>
-      <program name="GCS"/>
-      <program name="Data Link">
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-    </session>
-    <session name="Booz simulation : AHRS">
-      <program name="Messages">
-        <arg flag="-c" constant="telemetry"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : p"/>
-        <arg flag="-g" constant="0+450:830x450"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:p'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_p:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : q"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:q'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_q:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:sp_q:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : r"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:r'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gr:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_r:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:sp_r:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : phi"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:phi'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_phi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:sp_phi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:phi:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : theta"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:theta'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_theta:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:sp_theta:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:theta:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : psi"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:psi'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:psi:57.3'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="speed : u v w"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:u'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:v'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:w'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : x"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:x'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:est_x'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:sp_x'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : y"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:y'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:est_y:'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:sp_y:'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : z"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:z'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_VERT_LOOP:est_z'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_VERT_LOOP:sp_z'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : bp bq br"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:bp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:bq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:br:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bp'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bq'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:br'"/>
-      </program>
-      <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : covariances"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_phi_phi'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_phi_bp'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_bp_bp'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_theta_theta'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_theta_bq'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_bq_bq'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_psi_psi'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_psi_br'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_br_br'"/>
-      </program>
-    </session>
-    <session name="Flight USB-Maxstream@57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/paparazzi/xbee"/>
-        <arg flag="-transport" constant="xbee"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-    </session>
-    <session name="Flight USB-serial@9600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyUSB0"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-    </session>
-  </section>
-</control_panel>
diff --git a/conf/control_panel.xml.example b/conf/control_panel.xml.example
index 88bb2185d3..cca9f6c51c 100644
--- a/conf/control_panel.xml.example
+++ b/conf/control_panel.xml.example
@@ -121,127 +121,6 @@
       <program name="Server"/>
     </session>
 
-    <session name="Booz simulation : AHRS">
-
-     <program name="Messages">
-        <arg flag="-c" constant="telemetry"/>
-     </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : p"/>
-        <arg flag="-g" constant="0+450:830x450"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:p'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_p:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : q"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:q'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_q:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:sp_q:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : r"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:r'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gr:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_r:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:sp_r:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : phi"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:phi'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_phi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:sp_phi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:phi:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : theta"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:theta'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_theta:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:sp_theta:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:theta:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : psi"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:psi'"/>
-<!--        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_psi:57.3'"/> -->
-<!--        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:sp_psi:57.3'"/> -->
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:psi:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="speed : u v w"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:u'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:v'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:w'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : x"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:x'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:est_x'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:sp_x'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : y"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:y'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:est_y:'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_HOV_LOOP:sp_y:'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="position : z"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_SPEED_POS:z'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_VERT_LOOP:est_z'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_VERT_LOOP:sp_z'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : bp bq br"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:bp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:bq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_STATE:br:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bp'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bq'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:br'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : covariances"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_phi_phi'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_phi_bp'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_bp_bp'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_theta_theta'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_theta_bq'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_bq_bq'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_psi_psi'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_psi_br'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_EULER_COV:p_br_br'"/>
-    </program>
-
-    </session>
-
-
-
   </section>
 
 </control_panel>
diff --git a/conf/control_panel.xml.example.booz b/conf/control_panel.xml.example.booz
deleted file mode 100644
index 5ec2b32ed9..0000000000
--- a/conf/control_panel.xml.example.booz
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0"?>
-
-<control_panel name="paparazzi control panel">
-
-  <section name="variables">
-    <variable name="downlink_serial_port" value="/dev/ttyUSB0"/>
-    <variable name="fbw_serial_port"      value="/dev/ttyS1"/>
-    <variable name="ap_serial_port"       value="/dev/ttyS0"/>
-    <variable name="ivy_bus"              value="127:2010"/>
-    <variable name="map"                  value="muret_UTM.xml"/>
-    <variable name="flight_plan"          value="flight_plans/muret1.xml"/>
-  </section>
-
-  <section name="programs">
-    <program name="Server" command="sw/ground_segment/tmtc/server">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Data Link" command="sw/ground_segment/tmtc/link">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="GCS" command="sw/ground_segment/cockpit/gcs">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Messages" command="sw/ground_segment/tmtc/messages">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Settings" command="sw/ground_segment/tmtc/settings">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Log Plotter" command ="sw/logalizer/plot"/>
-
-    <program name="Real-time Plotter" command ="sw/logalizer/plotter"/>
-
-    <program name="Log File Player" command="sw/logalizer/play">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Simulator" command="sw/simulator/launchsitl">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Hardware in the Loop" command="sw/simulator/simhitl">
-      <arg flag="-fbw" variable="fbw_serial_port"/>
-      <arg flag="-ap" variable="ap_serial_port"/>
-    </program>
-
-    <program name="Environment Simulator" command="sw/simulator/gaia">
-      <arg flag="-b" variable="ivy_bus"/>
-    </program>
-
-    <program name="Http Server" command="sw/ground_segment/tmtc/boa"/>
- </section>
-
-
-
-
-  <section name="sessions">
-
-   <session name="Flight with USB-serial modem">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/ttyUSB0"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-    </session>
-
-   <session name="Flight with Maxstream@57600">
-      <program name="Data Link">
-        <arg flag="-d" constant="/dev/paparazzi/xbee"/>
-        <arg flag="-transport" constant="xbee"/>
-        <arg flag="-s" constant="57600"/>
-      </program>
-      <program name="Server"/>
-      <program name="GCS"/>
-    </session>
-
-    <session name="Booz AHRS quat">
-
-     <program name="Messages">
-        <arg flag="-c" constant="telemetry"/>
-     </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : p"/>
-        <arg flag="-g" constant="950x300+0+20"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:p'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_p:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : q"/>
-        <arg flag="-g" constant="950x300+0+320"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:q'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_q:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="rate : r"/>
-        <arg flag="-g" constant="950x300+0+620"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:r'"/>
-        <arg flag="-c" constant="'*:telemetry:IMU_GYRO:gr:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_RATE_LOOP:est_r:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : phi"/>
-        <arg flag="-g" constant="950x300+950+20"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:phi'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_phi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:phi:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : theta"/>
-        <arg flag="-g" constant="950x300+950+320"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:theta'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_theta:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:theta:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="attitude : psi"/>
-        <arg flag="-g" constant="950x300+950+620"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_RATE_ATTITUDE:psi'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_ATT_LOOP:est_psi:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_MEASURE:psi:57.3'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : bp bq br"/>
-        <arg flag="-g" constant="950x300+0+920"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_STATE:bp:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_STATE:bq:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_STATE:br:57.3'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bp'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:bq'"/>
-        <arg flag="-c" constant="'*:telemetry:BOOZ_SIM_GYRO_BIAS:br'"/>
-    </program>
-
-    <program name="Real-time Plotter">
-        <arg flag="-t" constant="ahrs : covariances"/>
-        <arg flag="-g" constant="950x300+950+920"/>
-        <arg flag="-u" constant="0.1"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_q0_q0'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_q1_q1'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_q2_q2'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_q3_q3'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_bp_bp'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_bq_bq'"/>
-        <arg flag="-c" constant="'*:telemetry:AHRS_QUAT_COV:p_br_br'"/>
-    </program>
-
-    </session>
-
-
-
-
-
-
-
-
-  </section>
-
-</control_panel>