diff --git a/conf/airframes/CDW/ChimuLisaFw.xml b/conf/airframes/CDW/ChimuLisaFw.xml
index 3c7ed0971c..71aac60c58 100644
--- a/conf/airframes/CDW/ChimuLisaFw.xml
+++ b/conf/airframes/CDW/ChimuLisaFw.xml
@@ -154,12 +154,6 @@
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
-
   <section name="SIMU">
     <define name="JSBSIM_MODEL" value="&quot;Malolo1&quot;"/>
     <define name="JSBSIM_IR_ROLL_NEUTRAL" value="RadOfDeg(0.)"/>
diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/drops.xml
index 289865ccae..f77fb115e8 100644
--- a/conf/airframes/ENAC/fixed-wing/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/drops.xml
@@ -210,10 +210,6 @@ on<!DOCTYPE airframe SYSTEM "airframe.dtd">
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
  <makefile>
 CONFIG = \"tiny_2_1.h\"
 
diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/slayer2.xml
index 70068d7f41..46d368aea6 100644
--- a/conf/airframes/ENAC/fixed-wing/slayer2.xml
+++ b/conf/airframes/ENAC/fixed-wing/slayer2.xml
@@ -188,13 +188,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
-<!--
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="AEROCOMM"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
--->
-
 
  <makefile>
 include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
diff --git a/conf/airframes/ENAC/malolo_sim.xml b/conf/airframes/ENAC/malolo_sim.xml
index 4d8c4f4cde..468d45916c 100644
--- a/conf/airframes/ENAC/malolo_sim.xml
+++ b/conf/airframes/ENAC/malolo_sim.xml
@@ -192,14 +192,7 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
-<!--
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
--->
 
   <section name="SIMU">
     <!--define name="JSBSIM_MODEL" value="&quot;fulmar&quot;"/-->
diff --git a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml b/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
deleted file mode 100644
index 67c5017f07..0000000000
--- a/conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE airframe SYSTEM "airframe.dtd">
-
-<!--
-	Multiplex EasyStar, using rudder
-	TWOG v1 board
-	Tilted infrared sensor
-	XBee 2.4GHz modem in transparent mode
--->
-
-<!-- commands section -->
-  <servos>
-    <servo name="THROTTLE"      no="0" min="1120" neutral="1120" max="1920"/>
-    <servo name="ELEVATOR"      no="6" min="1100" neutral="1514" max="1900"/>
-    <servo name="RUDDER"        no="7" min="2050" neutral="1612" max="950"/>
-  </servos>
-
-  <commands>
-    <axis name="THROTTLE" failsafe_value="0"/>
-    <axis name="ROLL"     failsafe_value="0"/>
-    <axis name="PITCH"    failsafe_value="0"/>
-  </commands>
-
-  <rc_commands>
-    <set command="ROLL"      value="@ROLL"/>
-    <set command="PITCH"     value="@PITCH"/>
-    <set command="THROTTLE"  value="@THROTTLE"/>
-  </rc_commands>
-
-  <command_laws>
-    <set servo="THROTTLE"    value="@THROTTLE"/>
-    <set servo="RUDDER"      value="@ROLL"/>
-    <set servo="ELEVATOR"    value="@PITCH"/>
-  </command_laws>
-
-  <section name="AUTO1" prefix="AUTO1_">
-    <define name="MAX_ROLL" value="RadOfDeg(50)"/>
-    <define name="MAX_PITCH" value="RadOfDeg(40)"/>
-  </section>
-
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-  </section>
-
-  <section name="INFRARED" prefix="IR_">
-    <define name="ADC_IR1_NEUTRAL" value="512"/>
-    <define name="ADC_IR2_NEUTRAL" value="510"/>
-    <define name="ADC_TOP_NEUTRAL" value="516"/>
-
-    <define name="LATERAL_CORRECTION" value="0.7"/>
-    <define name="LONGITUDINAL_CORRECTION" value="0.7"/>
-    <define name="VERTICAL_CORRECTION" value="1."/>
-
-    <define name="HORIZ_SENSOR_TILTED" value="1"/>
-    <define name="IR1_SIGN" value="1"/>
-    <define name="IR2_SIGN" value="-1"/>
-    <define name="TOP_SIGN" value="1"/>
-
-    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.3" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="-3" unit="deg"/>
-
-    <define name="CORRECTION_UP" value="1."/>
-    <define name="CORRECTION_DOWN" value="1."/>
-    <define name="CORRECTION_LEFT" value="1."/>
-    <define name="CORRECTION_RIGHT" value="1."/>
-  </section>
-
-  <section name="BAT">
-    <define name="CATASTROPHIC_BAT_LEVEL" value="8.0" unit="V"/>
-    <define name="CRITIC_BAT_LEVEL" value="8.5" unit="V"/>
-    <define name="LOW_BAT_LEVEL" value="9.5" unit="V"/>
-    <define name="MAX_BAT_LEVEL" value="12.5" unit="V"/>
-  </section>
-
-  <section name="MISC">
-    <define name="NOMINAL_AIRSPEED" value="15." unit="m/s"/>
-    <define name="CARROT" value="4." unit="s"/>
-    <define name="KILL_MODE_DISTANCE" value="(2.0*MAX_DIST_FROM_HOME)"/>
-    <define name="CONTROL_RATE" value="60" unit="Hz"/>
-    <define name="NO_XBEE_API_INIT" value="TRUE"/>
-    <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
-    <define name="TRIGGER_DELAY" value="1."/>
-    <define name="DEFAULT_CIRCLE_RADIUS" value="90."/>
-  </section>
-
-  <section name="VERTICAL CONTROL" prefix="V_CTL_">
-    <define name="POWER_CTL_BAT_NOMINAL" value="11.0" unit="volt"/>
-    <!-- outer loop -->
-    <define name="ALTITUDE_PGAIN" value="-0.075" unit="(m/s)/m"/>
-    <define name="ALTITUDE_MAX_CLIMB" value="4." unit="m/s"/>
-    <!-- auto throttle inner loop -->
-    <define name="AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE" value="0.5" unit="%"/>
-    <define name="AUTO_THROTTLE_MIN_CRUISE_THROTTLE" value="0.4" unit="%"/>
-    <define name="AUTO_THROTTLE_MAX_CRUISE_THROTTLE" value="0.8" unit="%"/>
-    <define name="AUTO_THROTTLE_LOITER_TRIM" value="1500" unit="pprz_t"/>
-    <define name="AUTO_THROTTLE_DASH_TRIM" value="-1000" unit="pprz_t"/>
-    <define name="AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT" value="0.1" unit="%/(m/s)"/>
-    <define name="AUTO_THROTTLE_PGAIN" value="-0.02" unit="%/(m/s)"/>
-    <define name="AUTO_THROTTLE_IGAIN" value="0.1"/>
-    <define name="AUTO_THROTTLE_PITCH_OF_VZ_PGAIN" value="0.05" unit="rad/(m/s)"/>
-    <define name="AUTO_PITCH_PGAIN" value="-0.125"/>
-    <define name="AUTO_PITCH_IGAIN" value="0.025"/>
-    <define name="AUTO_PITCH_MAX_PITCH" value="RadOfDeg(25)"/>
-    <define name="AUTO_PITCH_MIN_PITCH" value="RadOfDeg(-25)"/>
-    <define name="THROTTLE_SLEW" value="1.0"/>
-  </section>
-
-  <section name="HORIZONTAL CONTROL" prefix="H_CTL_">
-    <define name="COURSE_PGAIN" value="-0.7"/>
-    <define name="ROLL_MAX_SETPOINT" value="RadOfDeg(35)" unit="radians"/>
-    <define name="PITCH_MAX_SETPOINT" value="RadOfDeg(25)" unit="radians"/>
-    <define name="PITCH_MIN_SETPOINT" value="RadOfDeg(-25)" unit="radians"/>
-    <define name="PITCH_PGAIN" value="-20000."/>
-    <define name="PITCH_DGAIN" value="1.5"/>
-    <define name="ELEVATOR_OF_ROLL" value="2500"/>
-    <define name="ROLL_ATTITUDE_GAIN" value="-7400"/>
-    <define name="ROLL_RATE_GAIN" value="-200"/>
-  </section>
-
-  <section name="NAV">
-    <define name="NAV_PITCH" value="0."/>
-    <define name="NAV_GLIDE_PITCH_TRIM" value="0"/>
-  </section>
-
-  <section name="AGGRESSIVE" prefix="AGR_">
-    <define name="BLEND_START" value="20"/><!-- Altitude Error to Initiate Aggressive Climb CANNOT BE ZERO!!-->
-    <define name="BLEND_END" value="10"/><!-- Altitude Error to Blend Aggressive to Regular Climb Modes  CANNOT BE ZERO!!-->
-    <define name="CLIMB_THROTTLE" value="0.9"/><!-- Gaz for Aggressive Climb -->
-    <define name="CLIMB_PITCH" value="RadOfDeg(18)"/><!-- Pitch for Aggressive Climb -->
-    <define name="DESCENT_THROTTLE" value="0.1"/><!-- Gaz for Aggressive Decent -->
-    <define name="DESCENT_PITCH" value="RadOfDeg(-20)"/><!-- Pitch for Aggressive Decent -->
-    <define name="CLIMB_NAV_RATIO" value="0.8"/><!-- Percent Navigation for Altitude Error Equal to Start Altitude -->
-    <define name="DESCENT_NAV_RATIO" value="1.0"/>
-  </section>
-
-  <section name="FAILSAFE" prefix="FAILSAFE_">
-    <define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
-    <define name="DEFAULT_THROTTLE" value="0.4" unit="%"/>
-    <define name="DEFAULT_ROLL" value="RadOfDeg(15)" unit="rad"/>
-    <define name="DEFAULT_PITCH" value="RadOfDeg(0)" unit="rad"/>
-    <define name="HOME_RADIUS" value="90" unit="m"/>
-  </section>
-
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="PPRZ"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
-  <makefile>
-CONFIG = \"tiny_2_1_1.h\"
-
-# Target configuration
-include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
-
-FLASH_MODE=IAP
-
-ap.CFLAGS +=  -DFBW -DAP -DBOARD_CONFIG=$(CONFIG) -DUSE_LED -DTIME_LED=1 -DUSE_MODULES
-ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_fbw.c main_ap.c main.c
-
-ap.srcs += commands.c
-
-# Servo driver
-ap.CFLAGS += -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017
-ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
-
-# Radio configuration
-ap.CFLAGS += -DRADIO_CONTROL
-ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
-
-# Telemetry configuration
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
-ap.srcs += downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c pprz_transport.c
-
-ap.CFLAGS += -DINTER_MCU
-ap.srcs += inter_mcu.c
-
-# ADC configuration
-ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
-ap.srcs += $(SRC_ARCH)/adc_hw.c
-
-# USE_GPS configuration
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2
-ap.srcs += gps_ubx.c gps.c latlong.c
-
-ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN
-ap.srcs += infrared.c estimator.c
-
-# Control loops
-ap.CFLAGS += -DNAV -DLOITER_TRIM
-ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
-
-ap.srcs += subsystems/navigation/nav_line.c
-ap.srcs += subsystems/navigation/nav_survey_rectangle.c
-
-
-
-# Config for SITL simulation
-include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
-sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DLOITER_TRIM -DALT_KALMAN -DUSE_MODULES
-sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
-
-  </makefile>
-</airframe>
diff --git a/conf/airframes/TU_Delft/MicrojetCDW.xml b/conf/airframes/TU_Delft/MicrojetCDW.xml
index fc038e964e..a778aeb5ff 100644
--- a/conf/airframes/TU_Delft/MicrojetCDW.xml
+++ b/conf/airframes/TU_Delft/MicrojetCDW.xml
@@ -184,11 +184,6 @@
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
   <firmware name="fixedwing">
     <target name="ap" board="tiny_1.1">
       <configure name="PERIODIC_FREQUENCY" value="960"/> <!-- IMU FREQ -->
diff --git a/conf/airframes/TU_Delft/Trip50A.xml b/conf/airframes/TU_Delft/Trip50A.xml
index 857bb271f7..a37429aeb5 100644
--- a/conf/airframes/TU_Delft/Trip50A.xml
+++ b/conf/airframes/TU_Delft/Trip50A.xml
@@ -231,13 +231,6 @@ inline static void h_ctl_roll_loop( void ) {
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-<!--
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="0x005067361851"/>
-  </section>
--->
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/TU_Delft/Trip50B.xml b/conf/airframes/TU_Delft/Trip50B.xml
index dab375a875..a95827c333 100644
--- a/conf/airframes/TU_Delft/Trip50B.xml
+++ b/conf/airframes/TU_Delft/Trip50B.xml
@@ -236,13 +236,6 @@ inline static void h_ctl_roll_loop( void ) {
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-<!--
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="0x005067361851"/>
-  </section>
--->
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/TU_Delft/holiday50.xml b/conf/airframes/TU_Delft/holiday50.xml
index c60b9f2e2f..5a2724fbdb 100644
--- a/conf/airframes/TU_Delft/holiday50.xml
+++ b/conf/airframes/TU_Delft/holiday50.xml
@@ -231,13 +231,6 @@ inline static void h_ctl_roll_loop( void ) {
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-<!--
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="AEROCOMM"/>
-    <define name="DEVICE_ADDRESS" value="0x005067361851"/>
-  </section>
--->
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/easystar_example.xml b/conf/airframes/easystar_example.xml
index be87c02e21..58c5b0c2e6 100644
--- a/conf/airframes/easystar_example.xml
+++ b/conf/airframes/easystar_example.xml
@@ -164,9 +164,4 @@
     <define name="HOME_RADIUS" value="90" unit="m"/>
   </section>
 
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="PPRZ"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
 </airframe>
diff --git a/conf/airframes/mentor_tum.xml b/conf/airframes/mentor_tum.xml
index e7b0e7d831..df5cd797f7 100644
--- a/conf/airframes/mentor_tum.xml
+++ b/conf/airframes/mentor_tum.xml
@@ -208,13 +208,6 @@
     <define name="HOME_RADIUS" value="70" unit="m"/>
   </section>
 
-<!--
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="PPRZ"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
--->
-
   <section name="SIMU">
     <define name="JSBSIM_MODEL" value="&quot;Malolo1&quot;"/>
     <define name="JSBSIM_IR_ROLL_NEUTRAL" value="RadOfDeg(0.)"/>
diff --git a/conf/airframes/microjet_example.xml b/conf/airframes/microjet_example.xml
index 944c68f774..ec56ab56e9 100644
--- a/conf/airframes/microjet_example.xml
+++ b/conf/airframes/microjet_example.xml
@@ -157,12 +157,6 @@
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
 
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
-
   <section name="SIMU">
     <define name="JSBSIM_MODEL" value="&quot;Malolo1&quot;"/>
     <define name="JSBSIM_IR_ROLL_NEUTRAL" value="RadOfDeg(0.)"/>
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml
index 59172f27d6..3073f74886 100644
--- a/conf/airframes/mm/extra/press_t.xml
+++ b/conf/airframes/mm/extra/press_t.xml
@@ -174,11 +174,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
  <section name="SIMU">
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/mm/extra/probe_t.xml
index 37fd3601e2..01811ad4a0 100644
--- a/conf/airframes/mm/extra/probe_t.xml
+++ b/conf/airframes/mm/extra/probe_t.xml
@@ -194,11 +194,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
-  <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
   <section name="MAX11040">
diff --git a/conf/airframes/mm/extra/rctx.xml b/conf/airframes/mm/extra/rctx.xml
index 6001747f16..da6e0d221f 100644
--- a/conf/airframes/mm/extra/rctx.xml
+++ b/conf/airframes/mm/extra/rctx.xml
@@ -19,11 +19,6 @@
     <define name="VoltageOfAdc(adc)" value="(0.02454*adc)"/>
   </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <makefile>
 
 CONFIG = \"tiny_2_1.h\"
diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/mm/fixed-wing/funjeteth1.xml
index d0b9b75d5b..a65932583a 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth1.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth1.xml
@@ -170,11 +170,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
   <section name="MICROMAG">
diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/mm/fixed-wing/funjeteth2.xml
index fdd700591a..ab569e0540 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth2.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth2.xml
@@ -171,11 +171,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
   <section name="MICROMAG">
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/mm/fixed-wing/funjetfmi1.xml
index 4941da26af..bd39cefb89 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi1.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi1.xml
@@ -169,11 +169,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
  <section name="SIMU">
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/mm/fixed-wing/funjetfmi2.xml
index c076a05477..6dd3339263 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi2.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi2.xml
@@ -170,11 +170,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/mm/fixed-wing/funjetfmi3.xml
index 564d49b045..a0bac989c2 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi3.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi3.xml
@@ -168,11 +168,6 @@
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
  <section name="SIMU">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/mm/fixed-wing/funjetgfi1.xml
index 402d3614d4..e6f10ef4eb 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi1.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi1.xml
@@ -168,11 +168,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
index 3647cddfc0..4570d819b7 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi3.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
@@ -186,11 +186,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
   </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <makefile>
 include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
 
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/mm/fixed-wing/funjetgfi4.xml
index dd100932fc..4b2a1a8d56 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi4.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi4.xml
@@ -169,11 +169,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/mm/fixed-wing/funjetgfi5.xml
index 0731f33820..c2417140f0 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi5.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi5.xml
@@ -168,11 +168,6 @@
 	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
 	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
  <section name="SIMU">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/mm/fixed-wing/funjetgfi6.xml
index e4f607d80b..ba7035b60e 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi6.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi6.xml
@@ -170,11 +170,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/mm/fixed-wing/funjetgfi7.xml
index be48d15148..2938facb71 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi7.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi7.xml
@@ -170,11 +170,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/mm/fixed-wing/funjetgfi9.xml
index aaacc21284..4a10711d40 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi9.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi9.xml
@@ -168,11 +168,6 @@
 	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
 	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
 	<define name="HOME_RADIUS" value="100" unit="m"/>
-</section>
-
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
   </section>
 
  <section name="SIMU">
diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/mm/fixed-wing/funjetmm2.xml
index 03a942f097..61b63da805 100644
--- a/conf/airframes/mm/fixed-wing/funjetmm2.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm2.xml
@@ -176,11 +176,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <section name="SIMU">
     <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
  </section>
diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/mm/fixed-wing/miniwing.xml
index f4c41ba9f6..18705e7491 100644
--- a/conf/airframes/mm/fixed-wing/miniwing.xml
+++ b/conf/airframes/mm/fixed-wing/miniwing.xml
@@ -168,11 +168,6 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
  <makefile>
 CONFIG = \"tiny_2_1.h\"
 
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
index 67c62bfef9..a0e58b5052 100644
--- a/conf/airframes/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast.xml
@@ -217,11 +217,6 @@
     <define name="ROLL_RATE_DGAIN" value="0.0"/>
   </section>
 
- <section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section>
-
 
 <!--
  <makefile>
diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml
index 870947b36c..2449e4b47a 100644
--- a/conf/airframes/mm/fixed-wing/twinstarmm.xml
+++ b/conf/airframes/mm/fixed-wing/twinstarmm.xml
@@ -192,10 +192,6 @@
     <define name="HOME_RADIUS" value="100" unit="m"/>
   </section>
 
- <!--section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="XBEE"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-  </section-->
  <makefile>
 CONFIG = \"tiny_2_1.h\"
 
diff --git a/conf/airframes/Paul/minimag1.xml b/conf/airframes/obsolete/minimag1.xml
similarity index 100%
rename from conf/airframes/Paul/minimag1.xml
rename to conf/airframes/obsolete/minimag1.xml
diff --git a/conf/airframes/LAAS/mmlaas_N1_carto_cam.xml b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
similarity index 100%
rename from conf/airframes/LAAS/mmlaas_N1_carto_cam.xml
rename to conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
diff --git a/conf/airframes/test_i2c.xml b/conf/airframes/test_i2c.xml
index 53bf60d7dd..b7546315d2 100644
--- a/conf/airframes/test_i2c.xml
+++ b/conf/airframes/test_i2c.xml
@@ -1,10 +1,5 @@
 <airframe name="TEST_I2C">
 
-<section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="PPRZ"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-</section>
-
   <makefile>
 
 ARCH=lpc21