diff --git a/conf/settings/nps.xml b/conf/settings/nps.xml
index f68a29dca5..566f0a561f 100644
--- a/conf/settings/nps.xml
+++ b/conf/settings/nps.xml
@@ -7,8 +7,6 @@
        <dl_setting var="nps_bypass_ahrs" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ahrs" values="No|Yes"/>
        <dl_setting var="nps_bypass_ins" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="bypass_ins" values="No|Yes"/>
        <dl_setting var="gps_has_fix" min="0" step="1" max="1" module="subsystems/gps/gps_sim_nps" shortname="gps_fix" values="No|Yes"/>
-       <dl_setting var="autopilot.datalink_enabled" min="0" step="1" max="1" module="nps/nps_autopilot" shortname="datalink" values="OFF|ON"/>
-       <dl_setting var="ivy_tp.ivy_dl_enabled" min="0" step="1" max="1" module="subsystems/datalink/ivy_transport" shortname="downlink" values="OFF|ON"/>
        <dl_setting var="nps_electrical.supply_voltage" min="0" step="0.1" max="24" module="nps/nps_electrical" shortname="bat_voltage" unit="V"/>
        <dl_setting var="nps_atmosphere.wind_speed" min="0" step="0.1" max="25" module="nps/nps_atmosphere" shortname="wind_speed" unit="m/s" handler="set_wind_speed"/>
        <dl_setting var="nps_atmosphere.wind_dir" min="0" step="1" max="360" module="nps/nps_atmosphere" shortname="wind_dir" unit="rad" alt_unit="deg" handler="set_wind_dir"/>
diff --git a/sw/simulator/nps/nps_autopilot.h b/sw/simulator/nps/nps_autopilot.h
index 9576f5afce..0bbf425317 100644
--- a/sw/simulator/nps/nps_autopilot.h
+++ b/sw/simulator/nps/nps_autopilot.h
@@ -27,7 +27,6 @@
 struct NpsAutopilot {
   double commands[NPS_COMMANDS_NB];
   bool_t launch;
-  bool_t datalink_enabled;
 };
 
 extern struct NpsAutopilot autopilot;
diff --git a/sw/simulator/nps/nps_autopilot_fixedwing.c b/sw/simulator/nps/nps_autopilot_fixedwing.c
index e2c721eef9..e74b0c8c39 100644
--- a/sw/simulator/nps/nps_autopilot_fixedwing.c
+++ b/sw/simulator/nps/nps_autopilot_fixedwing.c
@@ -76,7 +76,6 @@ void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, cha
 {
 
   autopilot.launch = FALSE;
-  autopilot.datalink_enabled = TRUE;
 
   nps_radio_control_init(type_rc, num_rc_script, rc_dev);
   nps_electrical_init();
@@ -179,11 +178,6 @@ void nps_autopilot_run_step(double time)
   if (!launch) {
     autopilot.commands[COMMAND_THROTTLE] = 0;
   }
-
-  // hack to reset datalink_time, since we don't use actual dl_parse_msg
-  if (autopilot.datalink_enabled) {
-    datalink_time = 0;
-  }
 }
 
 void sim_overwrite_ahrs(void)
diff --git a/sw/simulator/nps/nps_autopilot_rotorcraft.c b/sw/simulator/nps/nps_autopilot_rotorcraft.c
index 12359455b5..823a7099a0 100644
--- a/sw/simulator/nps/nps_autopilot_rotorcraft.c
+++ b/sw/simulator/nps/nps_autopilot_rotorcraft.c
@@ -64,7 +64,6 @@ bool_t nps_bypass_ins;
 void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, char *rc_dev)
 {
   autopilot.launch = TRUE;
-  autopilot.datalink_enabled = TRUE;
 
   nps_radio_control_init(type_rc, num_rc_script, rc_dev);
   nps_electrical_init();
@@ -143,11 +142,6 @@ void nps_autopilot_run_step(double time)
   for (uint8_t i = 0; i < NPS_COMMANDS_NB; i++) {
     autopilot.commands[i] = (double)motor_mixing.commands[i] / MAX_PPRZ;
   }
-
-  // hack to reset datalink_time, since we don't use actual dl_parse_msg
-  if (autopilot.datalink_enabled) {
-    datalink_time = 0;
-  }
 }