diff --git a/sw/airborne/csc/mercury_csc_main.c b/sw/airborne/csc/mercury_csc_main.c
index ab55d1070e..c41b484a94 100644
--- a/sw/airborne/csc/mercury_csc_main.c
+++ b/sw/airborne/csc/mercury_csc_main.c
@@ -134,12 +134,6 @@ static void csc_main_init( void ) {
 #ifdef USE_AIRSPEED
 	airspeed_init();
 #endif
-#ifdef USE_AIRSPEED_ETS
-	airspeed_ets_init();
-#endif
-#ifdef USE_BARO_ETS
-	baro_ets_init();
-#endif
 #ifdef USE_AMS5812
 		csc_ams5812_init();
 #endif
@@ -181,19 +175,10 @@ static void csc_main_periodic( void )
 	csc_adc_periodic();
 	
 	if ((csc_loops % AIRSPEED_TIMEOUT) == 0) {
-#ifdef USE_AIRSPEED_ETS
-		airspeed_ets_periodic();
-#endif
-#ifdef USE_BARO_ETS
-		baro_ets_read();
-#endif
 	} else if ((csc_loops % AIRSPEED_TIMEOUT) == 1) {
 #ifdef USE_BARO_ETS
 		baro_ets_periodic();
 #endif
-#ifdef USE_AIRSPEED_ETS
-		airspeed_ets_read();
-#endif
 #ifdef USE_AIRSPEED
 		csc_airspeed_periodic();
 #endif
diff --git a/sw/airborne/main_ap.c b/sw/airborne/main_ap.c
index e27e5ea66d..4e28207b98 100644
--- a/sw/airborne/main_ap.c
+++ b/sw/airborne/main_ap.c
@@ -95,10 +95,6 @@
 #include "usb_serial.h"
 #endif
 
-#ifdef USE_AIRSPEED_ETS
-#include "airspeed_ets.h"
-#endif // USE_AIRSPEED_ETS
-
 #ifdef USE_BARO_ETS
 #include "baro_ets.h"
 #endif // USE_BARO_ETS
@@ -501,30 +497,6 @@ void periodic_task_ap( void ) {
 #error "Only 20 and 60 allowed for CONTROL_RATE"
 #endif
 
-#ifdef USE_I2C0
-  // I2C0 scheduler
-  switch (_20Hz) {
-    case 0:
-#ifdef USE_AIRSPEED_ETS
-      airspeed_ets_periodic(); // process airspeed
-#endif // USE_AIRSPEED_ETS
-#ifdef USE_BARO_ETS
-      baro_ets_read(); // initiate next i2c read
-#endif // USE_BARO_ETS
-      break;
-    case 1:
-#ifdef USE_BARO_ETS
-      baro_ets_periodic(); // process altitude
-#endif // USE_BARO_ETS
-#ifdef USE_AIRSPEED_ETS
-      airspeed_ets_read(); // initiate next i2c read
-#endif // USE_AIRSPEED_ETS
-      break;
-    case 2:
-      break;
-  }
-#endif // USE_I2C0
-
 #if CONTROL_RATE == 20
   if (!_20Hz)
 #endif
@@ -534,9 +506,6 @@ void periodic_task_ap( void ) {
       gyro_update();
 #endif
 
-#if defined USE_AIRSPEED || defined MEASURE_AIRSPEED
-      airspeed_update();
-#endif
 #ifdef INFRARED
       ir_update();
       estimator_update_state_infrared();
@@ -581,9 +550,6 @@ void init_ap( void ) {
 #ifdef GYRO
   gyro_init();
 #endif
-#if defined USE_AIRSPEED || defined MEASURE_AIRSPEED
-  airspeed_init();
-#endif
 #ifdef GPS
   gps_init();
 #endif
@@ -610,14 +576,6 @@ void init_ap( void ) {
   i2c1_init();
 #endif
 
-#ifdef USE_AIRSPEED_ETS
-  airspeed_ets_init();
-#endif
-
-#ifdef USE_BARO_ETS
-  baro_ets_init();
-#endif
-
 #ifdef USE_ADC_GENERIC
   adc_generic_init();
 #endif