diff --git a/sw/airborne/boards/apogee/imu_apogee.c b/sw/airborne/boards/apogee/imu_apogee.c
index 886afa1559..6617c90d8b 100644
--- a/sw/airborne/boards/apogee/imu_apogee.c
+++ b/sw/airborne/boards/apogee/imu_apogee.c
@@ -37,9 +37,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #if !defined APOGEE_LOWPASS_FILTER && !defined  APOGEE_SMPLRT_DIV
 #define APOGEE_LOWPASS_FILTER MPU60X0_DLPF_42HZ
diff --git a/sw/airborne/boards/lisa_m/baro_ms5611_i2c.c b/sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
index 10994d5948..44a2c7fa64 100644
--- a/sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
+++ b/sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
@@ -16,9 +16,6 @@
 #endif
 
 #ifdef DEBUG
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/boards/lisa_m/baro_ms5611_spi.c b/sw/airborne/boards/lisa_m/baro_ms5611_spi.c
index bd437cd318..7be72f8326 100644
--- a/sw/airborne/boards/lisa_m/baro_ms5611_spi.c
+++ b/sw/airborne/boards/lisa_m/baro_ms5611_spi.c
@@ -17,9 +17,6 @@
 #define MS5611_BUFFER_LENGTH    4
 
 #ifdef DEBUG
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/boards/navgo/imu_navgo.c b/sw/airborne/boards/navgo/imu_navgo.c
index 00582cfb5e..1d5fc8734e 100644
--- a/sw/airborne/boards/navgo/imu_navgo.c
+++ b/sw/airborne/boards/navgo/imu_navgo.c
@@ -40,9 +40,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef NAVGO_ACCEL_RATE
 #define NAVGO_ACCEL_RATE ADXL345_RATE_25HZ
diff --git a/sw/airborne/boards/umarim/imu_umarim.c b/sw/airborne/boards/umarim/imu_umarim.c
index 248b178977..510b179161 100644
--- a/sw/airborne/boards/umarim/imu_umarim.c
+++ b/sw/airborne/boards/umarim/imu_umarim.c
@@ -39,9 +39,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef UMARIM_ACCEL_RATE
 #define UMARIM_ACCEL_RATE ADXL345_RATE_50HZ
diff --git a/sw/airborne/firmwares/beth/rcv_telemetry.c b/sw/airborne/firmwares/beth/rcv_telemetry.c
index 93ee930d1e..6c8a4d37d3 100644
--- a/sw/airborne/firmwares/beth/rcv_telemetry.c
+++ b/sw/airborne/firmwares/beth/rcv_telemetry.c
@@ -38,9 +38,6 @@
 #include "generated/settings.h"
 
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "subsystems/datalink/downlink.h"
 
diff --git a/sw/airborne/firmwares/setup/setup_actuators.c b/sw/airborne/firmwares/setup/setup_actuators.c
index d55e6815ce..0ea774c58e 100644
--- a/sw/airborne/firmwares/setup/setup_actuators.c
+++ b/sw/airborne/firmwares/setup/setup_actuators.c
@@ -8,9 +8,6 @@
 
 #include "firmwares/fixedwing/main_fbw.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #define DATALINK_C
 #include "subsystems/datalink/datalink.h"
diff --git a/sw/airborne/modules/MPPT/MPPT.c b/sw/airborne/modules/MPPT/MPPT.c
index 1085f1cff3..6e1442e775 100644
--- a/sw/airborne/modules/MPPT/MPPT.c
+++ b/sw/airborne/modules/MPPT/MPPT.c
@@ -53,9 +53,6 @@ struct i2c_transaction mppt_trans;
 
 
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/MPPT/sim_MPPT.c b/sw/airborne/modules/MPPT/sim_MPPT.c
index 34d00e3dda..bdc7827ec3 100644
--- a/sw/airborne/modules/MPPT/sim_MPPT.c
+++ b/sw/airborne/modules/MPPT/sim_MPPT.c
@@ -22,9 +22,6 @@
 
 
 #include "MPPT.h"
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
diff --git a/sw/airborne/modules/adcs/adc_generic.c b/sw/airborne/modules/adcs/adc_generic.c
index 327c894056..1fc6596b46 100644
--- a/sw/airborne/modules/adcs/adc_generic.c
+++ b/sw/airborne/modules/adcs/adc_generic.c
@@ -18,9 +18,6 @@ uint16_t adc_generic_val2;
 #define ADC_CHANNEL_GENERIC_NB_SAMPLES DEFAULT_AV_NB_SAMPLE
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifdef ADC_CHANNEL_GENERIC1
 static struct adc_buf buf_generic1;
diff --git a/sw/airborne/modules/benchmark/flight_benchmark.c b/sw/airborne/modules/benchmark/flight_benchmark.c
index 7c352bc5d1..d58eb1153d 100644
--- a/sw/airborne/modules/benchmark/flight_benchmark.c
+++ b/sw/airborne/modules/benchmark/flight_benchmark.c
@@ -17,9 +17,6 @@
 // #include "math/pprz_algebra_float.h"
 
 // For Downlink
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 
 
diff --git a/sw/airborne/modules/cartography/cartography.c b/sw/airborne/modules/cartography/cartography.c
index 395781b082..64a3c1a0b3 100644
--- a/sw/airborne/modules/cartography/cartography.c
+++ b/sw/airborne/modules/cartography/cartography.c
@@ -136,9 +136,6 @@ bool_t ProjectionInsideLimitOfRail;
 #include "modules/cartography/cartography.h"
 #include "generated/modules.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "subsystems/datalink/downlink.h"
 #include "mcu_periph/uart.h"
 #include "std.h"
diff --git a/sw/airborne/modules/config/config_mkk_v2.c b/sw/airborne/modules/config/config_mkk_v2.c
index 449ad34386..92243aacc9 100644
--- a/sw/airborne/modules/config/config_mkk_v2.c
+++ b/sw/airborne/modules/config/config_mkk_v2.c
@@ -59,9 +59,6 @@ void config_mkk_v2_periodic_read_status(void)
   }
 }
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/core/sys_mon.c b/sw/airborne/modules/core/sys_mon.c
index c4d3239ccd..c999a0b0b0 100644
--- a/sw/airborne/modules/core/sys_mon.c
+++ b/sw/airborne/modules/core/sys_mon.c
@@ -62,9 +62,6 @@ void init_sysmon(void) {
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "subsystems/datalink/downlink.h"
 
 void periodic_report_sysmon(void) {
diff --git a/sw/airborne/modules/datalink/xtend_rssi.c b/sw/airborne/modules/datalink/xtend_rssi.c
index e5bdd57148..e13a4c2a50 100644
--- a/sw/airborne/modules/datalink/xtend_rssi.c
+++ b/sw/airborne/modules/datalink/xtend_rssi.c
@@ -31,9 +31,6 @@
 #include "mcu_periph/pwm_input.h"
 #include "mcu_periph/sys_time.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
diff --git a/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c b/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
index 05882fcfb8..d4b967b85d 100644
--- a/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
+++ b/sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
@@ -33,9 +33,6 @@
 #include "mcu_periph/i2c.h"
 #include "led.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/digital_cam/dc.c b/sw/airborne/modules/digital_cam/dc.c
index ec133836f5..0801fa54a5 100644
--- a/sw/airborne/modules/digital_cam/dc.c
+++ b/sw/airborne/modules/digital_cam/dc.c
@@ -49,9 +49,6 @@ bool_t dc_probing = FALSE;
 uint16_t dc_photo_nr = 0;
 uint16_t dc_buffer = 0;
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c b/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
index 1902a84af8..59d64a2a9d 100644
--- a/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
+++ b/sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
@@ -30,9 +30,6 @@
 #include "atmega_i2c_cam_ctrl.h"
 
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/enose/enose.c b/sw/airborne/modules/enose/enose.c
index 20e878b692..26fe69eb06 100644
--- a/sw/airborne/modules/enose/enose.c
+++ b/sw/airborne/modules/enose/enose.c
@@ -44,9 +44,6 @@ void enose_set_heat(uint8_t no_sensor, uint8_t value) {
 }
 
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/gps/gps_ubx_ucenter.c b/sw/airborne/modules/gps/gps_ubx_ucenter.c
index 8a4e254029..719e521db3 100644
--- a/sw/airborne/modules/gps/gps_ubx_ucenter.c
+++ b/sw/airborne/modules/gps/gps_ubx_ucenter.c
@@ -326,9 +326,6 @@ static inline void gps_ubx_ucenter_enable_msg(uint8_t class, uint8_t id, uint8_t
 
 
 // Text Telemetry for Debugging
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #undef GOT_PAYLOAD
 #include "subsystems/datalink/downlink.h"
 
diff --git a/sw/airborne/modules/gsm/gsm.c b/sw/airborne/modules/gsm/gsm.c
index d36cedeed8..14e8382b89 100644
--- a/sw/airborne/modules/gsm/gsm.c
+++ b/sw/airborne/modules/gsm/gsm.c
@@ -61,9 +61,6 @@ Receiving:
 #ifdef USE_USB_SERIAL
 #include "mcu_periph/usb_serial.h"
 #endif
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "subsystems/datalink/downlink.h"
 #include "ap_subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ahrs_chimu_spi.c b/sw/airborne/modules/ins/ahrs_chimu_spi.c
index ddb90ae9b4..3dba00c1ab 100644
--- a/sw/airborne/modules/ins/ahrs_chimu_spi.c
+++ b/sw/airborne/modules/ins/ahrs_chimu_spi.c
@@ -19,9 +19,6 @@
 #include "generated/airframe.h"
 
 #if CHIMU_DOWNLINK_IMMEDIATE
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ahrs_chimu_uart.c b/sw/airborne/modules/ins/ahrs_chimu_uart.c
index 01c8a1a77d..a549e709a9 100644
--- a/sw/airborne/modules/ins/ahrs_chimu_uart.c
+++ b/sw/airborne/modules/ins/ahrs_chimu_uart.c
@@ -15,9 +15,6 @@
 #include "generated/airframe.h"
 
 #if CHIMU_DOWNLINK_IMMEDIATE
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/alt_filter.c b/sw/airborne/modules/ins/alt_filter.c
index def8795654..9fd05f5109 100644
--- a/sw/airborne/modules/ins/alt_filter.c
+++ b/sw/airborne/modules/ins/alt_filter.c
@@ -24,9 +24,6 @@
 #include "subsystems/gps.h"
 #include "modules/sensors/baro_ets.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ins_arduimu.c b/sw/airborne/modules/ins/ins_arduimu.c
index 37df8f6ca4..a441613e0e 100644
--- a/sw/airborne/modules/ins/ins_arduimu.c
+++ b/sw/airborne/modules/ins/ins_arduimu.c
@@ -29,9 +29,6 @@ int32_t GPS_Data[14];
 //da ArduIMU das Read/Write Bit selber anfügt.
 #define ArduIMU_SLAVE_ADDR 0x22
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
diff --git a/sw/airborne/modules/ins/ins_arduimu_basic.c b/sw/airborne/modules/ins/ins_arduimu_basic.c
index a2bf6ea8d0..6b66a7e6d3 100644
--- a/sw/airborne/modules/ins/ins_arduimu_basic.c
+++ b/sw/airborne/modules/ins/ins_arduimu_basic.c
@@ -49,9 +49,6 @@
 #define ArduIMU_SLAVE_ADDR 0x22
 
 #ifdef ARDUIMU_SYNC_SEND
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ins_vn100.c b/sw/airborne/modules/ins/ins_vn100.c
index 45ed7059af..7b1f2b092b 100644
--- a/sw/airborne/modules/ins/ins_vn100.c
+++ b/sw/airborne/modules/ins/ins_vn100.c
@@ -299,9 +299,6 @@ static inline void parse_ins_msg( void ) {
 
 }
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ins_xsens.c b/sw/airborne/modules/ins/ins_xsens.c
index af9fd8a545..5f3186d9a1 100644
--- a/sw/airborne/modules/ins/ins_xsens.c
+++ b/sw/airborne/modules/ins/ins_xsens.c
@@ -176,9 +176,6 @@ uint8_t xsens_msg_buf[XSENS_MAX_PAYLOAD];
 #define GOT_CHECKSUM  6
 
 // FIXME Debugging Only
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/ins/ins_xsens700.c b/sw/airborne/modules/ins/ins_xsens700.c
index 2615487f69..f677b603bf 100644
--- a/sw/airborne/modules/ins/ins_xsens700.c
+++ b/sw/airborne/modules/ins/ins_xsens700.c
@@ -135,9 +135,6 @@ uint8_t xsens_msg_buf[XSENS_MAX_PAYLOAD];
 #define GOT_CHECKSUM  6
 
 // FIXME Debugging Only
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/meteo/charge_sens.c b/sw/airborne/modules/meteo/charge_sens.c
index 493d854239..c843612b50 100644
--- a/sw/airborne/modules/meteo/charge_sens.c
+++ b/sw/airborne/modules/meteo/charge_sens.c
@@ -31,9 +31,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef CHARGE_SENS_DEV
 #define CHARGE_SENS_DEV i2c0
diff --git a/sw/airborne/modules/meteo/dust_gp2y.c b/sw/airborne/modules/meteo/dust_gp2y.c
index c5b9b75f77..1fa0b3f6e6 100644
--- a/sw/airborne/modules/meteo/dust_gp2y.c
+++ b/sw/airborne/modules/meteo/dust_gp2y.c
@@ -41,9 +41,6 @@ float dust_gp2y_density_f;
 
 struct i2c_transaction gp2y_trans;
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef GP2Y_I2C_DEV
 #define GP2Y_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/geiger_counter.c b/sw/airborne/modules/meteo/geiger_counter.c
index 873598525e..6e9a065902 100644
--- a/sw/airborne/modules/meteo/geiger_counter.c
+++ b/sw/airborne/modules/meteo/geiger_counter.c
@@ -31,9 +31,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef GEIGER_CNT_DEV
 #define GEIGER_CNT_DEV i2c0
diff --git a/sw/airborne/modules/meteo/humid_dpicco.c b/sw/airborne/modules/meteo/humid_dpicco.c
index e86945e1a1..1048946375 100644
--- a/sw/airborne/modules/meteo/humid_dpicco.c
+++ b/sw/airborne/modules/meteo/humid_dpicco.c
@@ -36,9 +36,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef DPICCO_I2C_DEV
 #define DPICCO_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/humid_hih.c b/sw/airborne/modules/meteo/humid_hih.c
index 1d3e2836ba..fe6bb9cceb 100644
--- a/sw/airborne/modules/meteo/humid_hih.c
+++ b/sw/airborne/modules/meteo/humid_hih.c
@@ -36,9 +36,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef ADC_CHANNEL_HUMID_HIH
 #define ADC_CHANNEL_HUMID_HIH ADC_3
diff --git a/sw/airborne/modules/meteo/humid_htm_b71.c b/sw/airborne/modules/meteo/humid_htm_b71.c
index c938c9613b..0ccd52ad92 100644
--- a/sw/airborne/modules/meteo/humid_htm_b71.c
+++ b/sw/airborne/modules/meteo/humid_htm_b71.c
@@ -36,9 +36,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef HTM_I2C_DEV
 #define HTM_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/humid_pcap01.c b/sw/airborne/modules/meteo/humid_pcap01.c
index 6297c0065c..3a0e8617ee 100644
--- a/sw/airborne/modules/meteo/humid_pcap01.c
+++ b/sw/airborne/modules/meteo/humid_pcap01.c
@@ -39,9 +39,6 @@
 #include "modules/meteo/humid_pcap01_firmware.h"
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint8_t  pcap01_meas_started;
 struct i2c_transaction pcap01_trans;
diff --git a/sw/airborne/modules/meteo/humid_sht.c b/sw/airborne/modules/meteo/humid_sht.c
index 2de7164e4d..cff9134924 100644
--- a/sw/airborne/modules/meteo/humid_sht.c
+++ b/sw/airborne/modules/meteo/humid_sht.c
@@ -15,9 +15,6 @@
 
 #include "led.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint16_t humidsht, tempsht;
 float fhumidsht, ftempsht;
diff --git a/sw/airborne/modules/meteo/humid_sht_i2c.c b/sw/airborne/modules/meteo/humid_sht_i2c.c
index 0a8835b982..53118afa18 100644
--- a/sw/airborne/modules/meteo/humid_sht_i2c.c
+++ b/sw/airborne/modules/meteo/humid_sht_i2c.c
@@ -33,9 +33,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef SHT_I2C_DEV
 #define SHT_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/ir_mlx.c b/sw/airborne/modules/meteo/ir_mlx.c
index 87fb548e11..1e9a26c621 100644
--- a/sw/airborne/modules/meteo/ir_mlx.c
+++ b/sw/airborne/modules/meteo/ir_mlx.c
@@ -36,9 +36,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef MLX_I2C_DEV
 #define MLX_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/light_solar.c b/sw/airborne/modules/meteo/light_solar.c
index d43067d41d..a3f3452ed7 100644
--- a/sw/airborne/modules/meteo/light_solar.c
+++ b/sw/airborne/modules/meteo/light_solar.c
@@ -44,9 +44,6 @@
 #define ADC_CHANNEL_LIGHT_NB_SAMPLES 16
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint16_t up[LIGHT_NB], dn[LIGHT_NB];
 int32_t  light_cnt;
diff --git a/sw/airborne/modules/meteo/light_temt.c b/sw/airborne/modules/meteo/light_temt.c
index 8cecbb6893..fa486bf4f3 100644
--- a/sw/airborne/modules/meteo/light_temt.c
+++ b/sw/airborne/modules/meteo/light_temt.c
@@ -41,9 +41,6 @@
 #define ADC_CHANNEL_LIGHT_NB_SAMPLES 16
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint16_t adc_light_temt;
 
diff --git a/sw/airborne/modules/meteo/temp_lm75.c b/sw/airborne/modules/meteo/temp_lm75.c
index 82d6176d5d..b6af104bc8 100644
--- a/sw/airborne/modules/meteo/temp_lm75.c
+++ b/sw/airborne/modules/meteo/temp_lm75.c
@@ -35,9 +35,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint8_t  lm75_meas_started;
 struct i2c_transaction lm75_trans;
diff --git a/sw/airborne/modules/meteo/temp_tcouple_adc.c b/sw/airborne/modules/meteo/temp_tcouple_adc.c
index e3f39e79da..6455815e63 100644
--- a/sw/airborne/modules/meteo/temp_tcouple_adc.c
+++ b/sw/airborne/modules/meteo/temp_tcouple_adc.c
@@ -45,9 +45,6 @@
 #define ADC_CHANNEL_TEMP_TCOUPLE_NB_SAMPLES 16
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint16_t ref[TCOUPLE_NB], val[TCOUPLE_NB];
 float    fref[TCOUPLE_NB], fval[TCOUPLE_NB];
diff --git a/sw/airborne/modules/meteo/temp_temod.c b/sw/airborne/modules/meteo/temp_temod.c
index fa29204c13..5420e164a3 100644
--- a/sw/airborne/modules/meteo/temp_temod.c
+++ b/sw/airborne/modules/meteo/temp_temod.c
@@ -36,9 +36,6 @@
 float ftmd_temperature;
 struct i2c_transaction tmd_trans;
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef TEMOD_I2C_DEV
 #define TEMOD_I2C_DEV i2c0
diff --git a/sw/airborne/modules/meteo/temp_tmp102.c b/sw/airborne/modules/meteo/temp_tmp102.c
index db18649785..a4db095ad5 100644
--- a/sw/airborne/modules/meteo/temp_tmp102.c
+++ b/sw/airborne/modules/meteo/temp_tmp102.c
@@ -35,9 +35,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint8_t  tmp_meas_started;
 float ftmp_temperature;
diff --git a/sw/airborne/modules/meteo/windturbine.c b/sw/airborne/modules/meteo/windturbine.c
index a61e8084a4..e538a710f2 100644
--- a/sw/airborne/modules/meteo/windturbine.c
+++ b/sw/airborne/modules/meteo/windturbine.c
@@ -32,9 +32,6 @@
 #include "subsystems/gps.h"
 #include "mcu_periph/sys_time.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
diff --git a/sw/airborne/modules/multi/formation.c b/sw/airborne/modules/multi/formation.c
index 300ea47b8e..30d4f0ca89 100644
--- a/sw/airborne/modules/multi/formation.c
+++ b/sw/airborne/modules/multi/formation.c
@@ -6,9 +6,6 @@
 
 #include <math.h>
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "subsystems/datalink/downlink.h"
 
 #include "multi/formation.h"
diff --git a/sw/airborne/modules/multi/potential.c b/sw/airborne/modules/multi/potential.c
index fa0e09aa43..d4e3006112 100644
--- a/sw/airborne/modules/multi/potential.c
+++ b/sw/airborne/modules/multi/potential.c
@@ -5,9 +5,6 @@
 
 #include <math.h>
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "subsystems/datalink/downlink.h"
 #include "dl_protocol.h"
 
diff --git a/sw/airborne/modules/multi/tcas.c b/sw/airborne/modules/multi/tcas.c
index 4897ef983c..f55adf0571 100644
--- a/sw/airborne/modules/multi/tcas.c
+++ b/sw/airborne/modules/multi/tcas.c
@@ -33,9 +33,6 @@
 #include "generated/flight_plan.h"
 
 #include "messages.h"
-
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-
 #include "subsystems/datalink/downlink.h"
 
 float tcas_alt_setpoint;
diff --git a/sw/airborne/modules/nav/nav_catapult.c b/sw/airborne/modules/nav/nav_catapult.c
index 8ab4bb6d11..a65367ec83 100644
--- a/sw/airborne/modules/nav/nav_catapult.c
+++ b/sw/airborne/modules/nav/nav_catapult.c
@@ -48,9 +48,6 @@
 // Imu is required
 #include "subsystems/imu.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/datalink.h"
diff --git a/sw/airborne/modules/openlog/openlog.c b/sw/airborne/modules/openlog/openlog.c
index ca7dbbbca2..b6a407498a 100644
--- a/sw/airborne/modules/openlog/openlog.c
+++ b/sw/airborne/modules/openlog/openlog.c
@@ -32,9 +32,6 @@
 #include "subsystems/datalink/downlink.h"
 #include "mcu_periph/uart.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint32_t timestamp = 0; ///< Timestamp to be incremented during operation
 
diff --git a/sw/airborne/modules/sensors/AOA_adc.c b/sw/airborne/modules/sensors/AOA_adc.c
index bebcbe02fb..28dbc0e03b 100644
--- a/sw/airborne/modules/sensors/AOA_adc.c
+++ b/sw/airborne/modules/sensors/AOA_adc.c
@@ -57,9 +57,6 @@ float AOA_offset, AOA_filter;
 float AOA, AOA_old;
 
 // Downlink
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef SITL // Use ADC if not in simulation
 
diff --git a/sw/airborne/modules/sensors/airspeed_amsys.c b/sw/airborne/modules/sensors/airspeed_amsys.c
index 460e7e9c46..84d6243311 100644
--- a/sw/airborne/modules/sensors/airspeed_amsys.c
+++ b/sw/airborne/modules/sensors/airspeed_amsys.c
@@ -63,9 +63,6 @@
 #define TEMPERATURE_AMSYS_MIN -25
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 // Global variables
 uint16_t airspeed_amsys_raw;
diff --git a/sw/airborne/modules/sensors/airspeed_ets.c b/sw/airborne/modules/sensors/airspeed_ets.c
index 92930f2495..706904d3bb 100644
--- a/sw/airborne/modules/sensors/airspeed_ets.c
+++ b/sw/airborne/modules/sensors/airspeed_ets.c
@@ -69,9 +69,6 @@
 #define AIRSPEED_ETS_I2C_DEV i2c0
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 // Global variables
 uint16_t airspeed_ets_raw;
diff --git a/sw/airborne/modules/sensors/airspeed_otf.c b/sw/airborne/modules/sensors/airspeed_otf.c
index 8a2048161d..4b5f5bf7bc 100644
--- a/sw/airborne/modules/sensors/airspeed_otf.c
+++ b/sw/airborne/modules/sensors/airspeed_otf.c
@@ -37,9 +37,6 @@
 #include "met_module.h"
 #include "airspeed_otf.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #define OTF_UNINIT         0x00
 #define OTF_WAIT_START     OTF_UNINIT
diff --git a/sw/airborne/modules/sensors/alt_srf08.c b/sw/airborne/modules/sensors/alt_srf08.c
index 10fb93d995..0bc5370d5d 100644
--- a/sw/airborne/modules/sensors/alt_srf08.c
+++ b/sw/airborne/modules/sensors/alt_srf08.c
@@ -34,9 +34,6 @@
 #include "subsystems/datalink/downlink.h"
 #include "led.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef SRF08_I2C_DEV
 #define SRF08_I2C_DEV i2c0
diff --git a/sw/airborne/modules/sensors/baro_amsys.c b/sw/airborne/modules/sensors/baro_amsys.c
index 209140ca4f..a3e23c62c7 100644
--- a/sw/airborne/modules/sensors/baro_amsys.c
+++ b/sw/airborne/modules/sensors/baro_amsys.c
@@ -38,9 +38,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 //#include "gps.h"
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifdef SITL
 #include "subsystems/gps.h"
diff --git a/sw/airborne/modules/sensors/baro_bmp.c b/sw/airborne/modules/sensors/baro_bmp.c
index bdfce3a3af..cba28c6397 100644
--- a/sw/airborne/modules/sensors/baro_bmp.c
+++ b/sw/airborne/modules/sensors/baro_bmp.c
@@ -42,9 +42,6 @@
 #include "subsystems/gps.h"
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #if !defined(SENSOR_SYNC_SEND) && !defined(USE_BARO_BMP)
 #warning set SENSOR_SYNC_SEND to use baro_bmp
diff --git a/sw/airborne/modules/sensors/baro_ets.c b/sw/airborne/modules/sensors/baro_ets.c
index 3f2e7fa1d6..c3b89644d0 100644
--- a/sw/airborne/modules/sensors/baro_ets.c
+++ b/sw/airborne/modules/sensors/baro_ets.c
@@ -51,9 +51,6 @@
 #endif
 
 #ifdef BARO_ETS_TELEMETRY
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #include "mcu_periph/uart.h"
 #include "messages.h"
diff --git a/sw/airborne/modules/sensors/baro_hca.c b/sw/airborne/modules/sensors/baro_hca.c
index b8c257c848..944213673c 100644
--- a/sw/airborne/modules/sensors/baro_hca.c
+++ b/sw/airborne/modules/sensors/baro_hca.c
@@ -29,9 +29,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #define BARO_HCA_ADDR 0xF0
 #define BARO_HCA_MAX_PRESSURE 1100 // mBar
diff --git a/sw/airborne/modules/sensors/baro_mpl3115.c b/sw/airborne/modules/sensors/baro_mpl3115.c
index f44e248c64..018ac5af8b 100644
--- a/sw/airborne/modules/sensors/baro_mpl3115.c
+++ b/sw/airborne/modules/sensors/baro_mpl3115.c
@@ -27,9 +27,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 void baro_mpl3115_init( void ) {
   mpl3115_init();
diff --git a/sw/airborne/modules/sensors/baro_ms5611_i2c.c b/sw/airborne/modules/sensors/baro_ms5611_i2c.c
index 2ba16cc9a4..8daba2dca4 100644
--- a/sw/airborne/modules/sensors/baro_ms5611_i2c.c
+++ b/sw/airborne/modules/sensors/baro_ms5611_i2c.c
@@ -35,9 +35,6 @@
 #include "subsystems/datalink/downlink.h"
 #include "subsystems/nav.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #ifndef MS5611_I2C_DEV
 #define MS5611_I2C_DEV i2c0
diff --git a/sw/airborne/modules/sensors/baro_scp.c b/sw/airborne/modules/sensors/baro_scp.c
index 94a2f67807..60de6a0842 100644
--- a/sw/airborne/modules/sensors/baro_scp.c
+++ b/sw/airborne/modules/sensors/baro_scp.c
@@ -15,9 +15,6 @@
 #warning set SENSOR_SYNC_SEND to use baro_scp
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 #define STA_UNINIT       0
 #define STA_INITIALISING 1
diff --git a/sw/airborne/modules/sensors/baro_scp_i2c.c b/sw/airborne/modules/sensors/baro_scp_i2c.c
index a3c1f24d16..3711301752 100644
--- a/sw/airborne/modules/sensors/baro_scp_i2c.c
+++ b/sw/airborne/modules/sensors/baro_scp_i2c.c
@@ -19,9 +19,6 @@
 #warning set SENSOR_SYNC_SEND to use baro_scp_i2c
 #endif
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 uint8_t  baro_scp_status;
 uint32_t baro_scp_pressure;
diff --git a/sw/airborne/modules/sensors/imu_aspirin2.c b/sw/airborne/modules/sensors/imu_aspirin2.c
index d4bd047b61..585faaec9c 100644
--- a/sw/airborne/modules/sensors/imu_aspirin2.c
+++ b/sw/airborne/modules/sensors/imu_aspirin2.c
@@ -28,9 +28,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 
 // Peripherials
diff --git a/sw/airborne/modules/sensors/mag_hmc5843.c b/sw/airborne/modules/sensors/mag_hmc5843.c
index d503cba8bd..75f3266a35 100644
--- a/sw/airborne/modules/sensors/mag_hmc5843.c
+++ b/sw/airborne/modules/sensors/mag_hmc5843.c
@@ -30,9 +30,6 @@ int32_t mag_x, mag_y, mag_z;
 bool_t mag_valid;
 
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 
 void hmc5843_module_init( void ) {
diff --git a/sw/airborne/modules/sensors/mag_hmc58xx.c b/sw/airborne/modules/sensors/mag_hmc58xx.c
index b5d6133359..5eb5ec11ba 100644
--- a/sw/airborne/modules/sensors/mag_hmc58xx.c
+++ b/sw/airborne/modules/sensors/mag_hmc58xx.c
@@ -30,9 +30,6 @@
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 struct Hmc58xx mag_hmc58xx;
 
diff --git a/sw/airborne/modules/sensors/mag_micromag_fw.c b/sw/airborne/modules/sensors/mag_micromag_fw.c
index 33d7356c60..f6b721ae10 100644
--- a/sw/airborne/modules/sensors/mag_micromag_fw.c
+++ b/sw/airborne/modules/sensors/mag_micromag_fw.c
@@ -2,9 +2,6 @@
 #include "modules/sensors/mag_micromag_fw_hw.h"
 #include "led.h"
 
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/sonar/sonar_adc.c b/sw/airborne/modules/sonar/sonar_adc.c
index 96672c573e..189cf079eb 100644
--- a/sw/airborne/modules/sonar/sonar_adc.c
+++ b/sw/airborne/modules/sonar/sonar_adc.c
@@ -30,9 +30,6 @@
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 
 /** Sonar offset.
  *  Offset value in m (float)
diff --git a/sw/airborne/subsystems/ahrs/ahrs_float_dcm.c b/sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
index b53f0bdea0..1a08c8bdae 100644
--- a/sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
+++ b/sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
@@ -50,9 +50,6 @@
 
 #if FLOAT_DCM_SEND_DEBUG
 // FIXME Debugging Only
-#ifndef DOWNLINK_DEVICE
-#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
-#endif
 #include "mcu_periph/uart.h"
 #include "messages.h"
 #include "subsystems/datalink/downlink.h"