diff --git a/conf/airframes/booz2_a1.xml b/conf/airframes/booz2_a1.xml
index 1dfad143b9..cede0bc2a7 100644
--- a/conf/airframes/booz2_a1.xml
+++ b/conf/airframes/booz2_a1.xml
@@ -144,7 +144,6 @@
diff --git a/conf/airframes/booz2_a5.xml b/conf/airframes/booz2_a5.xml
index 3b7a49409b..a0a87f9e1e 100644
--- a/conf/airframes/booz2_a5.xml
+++ b/conf/airframes/booz2_a5.xml
@@ -137,7 +137,6 @@
diff --git a/conf/airframes/booz2_flixr.xml b/conf/airframes/booz2_flixr.xml
index 08373d292b..68780181d8 100644
--- a/conf/airframes/booz2_flixr.xml
+++ b/conf/airframes/booz2_flixr.xml
@@ -134,7 +134,6 @@
diff --git a/sw/airborne/booz/booz2_ins.c b/sw/airborne/booz/booz2_ins.c
index 27b663b7a0..a4dc084901 100644
--- a/sw/airborne/booz/booz2_ins.c
+++ b/sw/airborne/booz/booz2_ins.c
@@ -109,19 +109,12 @@ void booz_ins_periodic( void ) {
}
void booz_ins_propagate() {
-#ifdef BOOZ_INS_UNTILT_ACCEL
+ /* untilt accels */
struct Int32Vect3 accel_body;
INT32_RMAT_TRANSP_VMULT(accel_body, booz_imu.body_to_imu_rmat, booz_imu.accel);
struct Int32Vect3 accel_ltp;
INT32_RMAT_TRANSP_VMULT(accel_ltp, booz_ahrs.ltp_to_body_rmat, accel_body);
-#ifndef USE_HFF
- booz_ins_ltp_accel.x = accel_ltp.x;
- booz_ins_ltp_accel.y = accel_ltp.y;
-#endif
float z_accel_float = ACCEL_FLOAT_OF_BFP(accel_ltp.z);
-#else /* BOOZ_INS_UNTILT_ACCELS */
- float z_accel_float = ACCEL_FLOAT_OF_BFP(booz_imu.accel.z);
-#endif /* BOOZ_INS_UNTILT_ACCELS */
#ifdef USE_VFF
if (booz2_analog_baro_status == BOOZ2_ANALOG_BARO_RUNNING && booz_ins_baro_initialised) {
@@ -161,7 +154,11 @@ void booz_ins_propagate() {
} else {
b2_hff_ps_counter++;
}
+#else
+ booz_ins_ltp_accel.x = accel_ltp.x;
+ booz_ins_ltp_accel.y = accel_ltp.y;
#endif /* USE_HFF */
+
INT32_VECT3_ENU_OF_NED(booz_ins_enu_pos, booz_ins_ltp_pos);
INT32_VECT3_ENU_OF_NED(booz_ins_enu_speed, booz_ins_ltp_speed);
INT32_VECT3_ENU_OF_NED(booz_ins_enu_accel, booz_ins_ltp_accel);