diff --git a/conf/airframes/ENAC/fixed-wing/drops.xml b/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
similarity index 100%
rename from conf/airframes/ENAC/fixed-wing/drops.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
diff --git a/conf/airframes/ENAC/fixed-wing/funjet1.xml b/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
similarity index 97%
rename from conf/airframes/ENAC/fixed-wing/funjet1.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
index 0eab718515..73459dc2fe 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
@@ -53,17 +53,6 @@
     <define name="MAX_PITCH" value="0.6"/>
   </section>
 
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-
-    <define name="GYRO_ROLL" value="ADC_3"/>
-    <define name="GYRO_NB_SAMPLES" value="16"/>
-
-  </section>
-
   <section name="INFRARED" prefix="IR_">
     <define name="ADC_IR1_NEUTRAL" value="512"/>
     <define name="ADC_IR2_NEUTRAL" value="512"/>
diff --git a/conf/airframes/ENAC/malolo_sim.xml b/conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
similarity index 100%
rename from conf/airframes/ENAC/malolo_sim.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
diff --git a/conf/airframes/ENAC/fixed-wing/slayer2.xml b/conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
similarity index 100%
rename from conf/airframes/ENAC/fixed-wing/slayer2.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
diff --git a/conf/airframes/ENAC/fixed-wing/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
similarity index 100%
rename from conf/airframes/ENAC/fixed-wing/solarstorm.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
diff --git a/conf/airframes/ENAC/fixed-wing/spocII.xml b/conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
similarity index 100%
rename from conf/airframes/ENAC/fixed-wing/spocII.xml
rename to conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
diff --git a/conf/airframes/TU_Delft/Trip50A.xml b/conf/airframes/TU_Delft/Trip50A.xml
index 309f9207ec..0666e4fb0b 100644
--- a/conf/airframes/TU_Delft/Trip50A.xml
+++ b/conf/airframes/TU_Delft/Trip50A.xml
@@ -51,13 +51,6 @@
   </section>
 
   <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-    <define name="GYRO_ROLL" value="ADC_4"/>
-    <define name="GYRO_PITCH" value="ADC_5"/>
-    <define name="GYRO_NB_SAMPLES" value="16"/>
     <define name="AIRSPEED" value="ADC_3"/>
     <define name="AIRSPEED_NB_SAMPLES" value="32"/>
   </section>
diff --git a/conf/airframes/example_twog_analogimu.xml b/conf/airframes/example_twog_analogimu.xml
index 17be71780c..628e12060f 100644
--- a/conf/airframes/example_twog_analogimu.xml
+++ b/conf/airframes/example_twog_analogimu.xml
@@ -79,13 +79,6 @@
     <define name="MAX_PITCH" value="1.0"/>
   </section>
 
-  <!-- Configure the pinning of the ADC -->
-
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="GYRO_NB_SAMPLES" value="16" />
-    <define name="ACCEL_NB_SAMPLES" value="32" />
-  </section>
-
   <!-- settings for the Analog IMU -->
 
   <section name="INS" prefix="INS_">
@@ -210,6 +203,7 @@
       <configure name="ACCEL_X" value="ADC_5"/>
       <configure name="ACCEL_Y" value="ADC_6"/>
       <configure name="ACCEL_Z" value="ADC_7"/>
+      <configure name="ADC_ACCEL_NB_SAMPLES" value="32"/>
     </subsystem>
 
     <subsystem name="ahrs"  type="float_dcm"/>
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml
index c14ba8ee72..601e3fbfb1 100644
--- a/conf/airframes/mm/fixed-wing/drops.xml
+++ b/conf/airframes/mm/fixed-wing/drops.xml
@@ -90,15 +90,6 @@
     <define name="MAX_PITCH" value="0.6"/>
   </section>
 
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-    <define name="GYRO_ROLL" value="ADC_3"/>
-    <!--define name="GYRO_NB_SAMPLES" value="32"/-->
-  </section>
-
   <section name="INFRARED" prefix="IR_">
     <define name="ADC_IR1_NEUTRAL" value="512"/>
     <define name="ADC_IR2_NEUTRAL" value="512"/>
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
index a0e58b5052..3c8721be19 100644
--- a/conf/airframes/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast.xml
@@ -72,15 +72,6 @@
     <define name="MAX_PITCH" value="0.6"/>
   </section>
 
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-    <define name="GYRO_ROLL" value="ADC_3"/>
-    <define name="GYRO_NB_SAMPLES" value="16"/>
-  </section>
-
   <section name="INFRARED" prefix="IR_">
     <define name="ADC_IR1_NEUTRAL" value="512"/>
     <define name="ADC_IR2_NEUTRAL" value="512"/>
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml
index d8833cad6c..d4c4983651 100644
--- a/conf/airframes/mm/fixed-wing/slowfast2.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast2.xml
@@ -78,15 +78,6 @@
     <define name="MAX_PITCH" value="0.6"/>
   </section>
 
-  <section name="adc" prefix="ADC_CHANNEL_">
-    <define name="IR1" value="ADC_1"/>
-    <define name="IR2" value="ADC_2"/>
-    <define name="IR_TOP" value="ADC_0"/>
-    <define name="IR_NB_SAMPLES" value="16"/>
-    <define name="GYRO_ROLL" value="ADC_3"/>
-    <define name="GYRO_NB_SAMPLES" value="16"/>
-  </section>
-
   <section name="INFRARED" prefix="IR_">
     <define name="ADC_IR1_NEUTRAL" value="512"/>
     <define name="ADC_IR2_NEUTRAL" value="512"/>
diff --git a/conf/airframes/osam_xsens_twog.xml b/conf/airframes/obsolete/osam_xsens_twog.xml
similarity index 100%
rename from conf/airframes/osam_xsens_twog.xml
rename to conf/airframes/obsolete/osam_xsens_twog.xml