diff --git a/conf/airframes/ENAC/fixed-wing/funjet2.xml b/conf/airframes/ENAC/fixed-wing/funjet2.xml
index 56455152a5..670c51f99a 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2.xml
@@ -15,9 +15,6 @@
       <define name="LIGHT_LED_STROBE" value="5"/>
       <define name="LIGHT_LED_NAV" value="3"/>
     </load-->
-    <!--load name="baro_board.xml">
-      <define name="BARO_ABS_EVENT" value="BaroPbnUpdate"/>
-    </load-->
     <load name="pbn.xml"/>
   </modules>
 
diff --git a/conf/airframes/ENAC/fixed-wing/mythe.xml b/conf/airframes/ENAC/fixed-wing/mythe.xml
index f6c226b11b..58d0beaac0 100644
--- a/conf/airframes/ENAC/fixed-wing/mythe.xml
+++ b/conf/airframes/ENAC/fixed-wing/mythe.xml
@@ -9,7 +9,6 @@
 <airframe name="Funjet">
 
   <modules>
-    <!--load name="baro_board.xml"/-->
     <load name="airspeed_adc.xml">
       <configure name="ADC_AIRSPEED" value="ADC_0"/>
       <define name="AIRSPEED_QUADRATIC_SCALE" value="1.09378"/>
diff --git a/conf/airframes/examples/Twinstar_energyadaptive.xml b/conf/airframes/examples/Twinstar_energyadaptive.xml
index d58dbd1fb1..66e236d673 100644
--- a/conf/airframes/examples/Twinstar_energyadaptive.xml
+++ b/conf/airframes/examples/Twinstar_energyadaptive.xml
@@ -53,9 +53,6 @@ twog_1.0 + aspirin + ETS baro + ETS speed
       <define name="BARO_ETS_SCALE" value="0.3"/>
       <define name="BARO_ETS_SYNC_SEND"/>
     </load>
-    <load name="baro_board.xml">
-      <define name="BARO_ABS_EVENT" value="BaroEtsUpdate"/>
-    </load>
     <load name="digital_cam.xml">
       <define name="DC_SHUTTER_LED" value="5"/><!-- led4:aux led5:camsw-->
     </load>
diff --git a/conf/airframes/examples/easystar_ets.xml b/conf/airframes/examples/easystar_ets.xml
index a66406c0c7..ea1d6b70d2 100644
--- a/conf/airframes/examples/easystar_ets.xml
+++ b/conf/airframes/examples/easystar_ets.xml
@@ -37,9 +37,6 @@
   <modules>
     <load name="airspeed_ets.xml"/>
     <load name="baro_ets.xml"/>
-    <load name="baro_board.xml">
-      <define name="BARO_ABS_EVENT" value="BaroEtsUpdate"/>
-    </load>
     <load name="infrared_adc.xml"/>
   </modules>
 
diff --git a/conf/airframes/examples/quadrotor_navgo.xml b/conf/airframes/examples/quadrotor_navgo.xml
index 98df961abd..e7f5a5ad05 100644
--- a/conf/airframes/examples/quadrotor_navgo.xml
+++ b/conf/airframes/examples/quadrotor_navgo.xml
@@ -36,6 +36,8 @@
     <subsystem name="stabilization" type="int_euler"/>
     <subsystem name="ahrs"          type="int_cmpl_quat"/>
     <subsystem name="ins"           type="hff"/>
+
+    <configure name="AHRS_PROPAGATE_FREQUENCY" value="512"/>
   </firmware>
 
   <section name="MIXING" prefix="MOTOR_MIXING_">
@@ -117,7 +119,6 @@
 
   <!-- Magnetic field for Toulouse (declination -16°) -->
   <section name="AHRS" prefix="AHRS_">
-    <define name="PROPAGATE_FREQUENCY" value="512"/>
     <define name="PROPAGATE_LOW_PASS_RATES" value="1"/>
     <define name="H_X" value=" 0.513081"/>
     <define name="H_Y" value="-0.00242783"/>
diff --git a/conf/airframes/examples/stm32f4_discovery_test.xml b/conf/airframes/examples/stm32f4_discovery_test.xml
index 2f10e1c38b..d5da1a6a6c 100644
--- a/conf/airframes/examples/stm32f4_discovery_test.xml
+++ b/conf/airframes/examples/stm32f4_discovery_test.xml
@@ -35,9 +35,6 @@
       <define name="BARO_ETS_SYNC_SEND"/>
       <define name="BARO_ETS_I2C_DEV" value="i2c1"/>
     </load>
-    <load name="baro_board.xml">
-      <define name="BARO_ABS_EVENT" value="BaroEtsUpdate"/>
-    </load>
   </modules>
 
   <servos driver="Pwm">