removed some old BOOZ2_SONAR cruft

sw/airborne/firmwares/rotorcraft/telemetry.h

@@ -751,12 +751,8 @@ extern uint8_t telemetry_mode_Main_DefaultChannel;
                    );                          \
   }
 
-//TODO replace by BOOZ_EXTRA_ADC
-#ifdef BOOZ2_SONAR
-#define PERIODIC_SEND_BOOZ2_SONAR(_trans, _dev) DOWNLINK_SEND_BOOZ2_SONAR(_trans, _dev,&booz2_adc_1,&booz2_adc_2,&booz2_adc_3,&booz2_adc_4);
-#else
+// FIXME: still used?? or replace by EXTRA_ADC
 #define PERIODIC_SEND_BOOZ2_SONAR(_trans, _dev) {}
-#endif
 
 #ifdef BOOZ2_TRACK_CAM
 #include "cam_track.h"

sw/airborne/subsystems/ins.c

@@ -39,10 +39,6 @@
 #include "subsystems/ins/hf_float.h"
 #endif
 
-#ifdef BOOZ2_SONAR
-#include "generated/modules.h"
-#endif
-
 #ifdef SITL
 #include "nps_fdm.h"
 #include <stdio.h>
@@ -107,7 +103,7 @@ void ins_init() {
 #endif
 #if USE_VFF
   ins_baro_initialised = FALSE;
-#ifdef BOOZ2_SONAR
+#if USE_SONAR
   ins_update_on_agl = FALSE;
 #endif
   vff_init(0., 0., 0.);