diff --git a/conf/airframes/CDW/ChimuLisaFw.xml b/conf/airframes/CDW/ChimuLisaFw.xml
index e48d3bd267..baf7be8283 100644
--- a/conf/airframes/CDW/ChimuLisaFw.xml
+++ b/conf/airframes/CDW/ChimuLisaFw.xml
@@ -130,8 +130,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <modules>
diff --git a/conf/airframes/CDW/ChimuTinyFw.xml b/conf/airframes/CDW/ChimuTinyFw.xml
index 1f93d54548..3831d918d2 100644
--- a/conf/airframes/CDW/ChimuTinyFw.xml
+++ b/conf/airframes/CDW/ChimuTinyFw.xml
@@ -58,8 +58,8 @@
   </command_laws>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="AUTO1" prefix="AUTO1_">
diff --git a/conf/airframes/CDW/ChimuTinyFwSpi.xml b/conf/airframes/CDW/ChimuTinyFwSpi.xml
index 4095147ebf..43e48e551d 100644
--- a/conf/airframes/CDW/ChimuTinyFwSpi.xml
+++ b/conf/airframes/CDW/ChimuTinyFwSpi.xml
@@ -58,8 +58,8 @@
   </command_laws>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="AUTO1" prefix="AUTO1_">
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2.xml b/conf/airframes/ENAC/fixed-wing/funjet2.xml
index dd9a81faa1..590d0f132c 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2.xml
@@ -109,8 +109,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="2." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2." unit="deg"/>
   </section>
 
   <!-- Gyro sensitivity : -->
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml b/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
index e637b51cd0..35a81064d0 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
@@ -116,8 +116,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="2." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2." unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
index 42c3d51944..0b3075f4fe 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
@@ -116,8 +116,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2.)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="2." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2." unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/ENAC/fixed-wing/funjet3.xml b/conf/airframes/ENAC/fixed-wing/funjet3.xml
index 8e53a77ad1..976dad60b6 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet3.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet3.xml
@@ -94,8 +94,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="rad"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="rad"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="rad"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0." unit="rad"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/ENAC/fixed-wing/merlin.xml b/conf/airframes/ENAC/fixed-wing/merlin.xml
index 2693d03086..8cf168b61f 100644
--- a/conf/airframes/ENAC/fixed-wing/merlin.xml
+++ b/conf/airframes/ENAC/fixed-wing/merlin.xml
@@ -88,8 +88,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/ENAC/fixed-wing/minimag1.xml b/conf/airframes/ENAC/fixed-wing/minimag1.xml
index d53d3b17ff..f4eebf8834 100644
--- a/conf/airframes/ENAC/fixed-wing/minimag1.xml
+++ b/conf/airframes/ENAC/fixed-wing/minimag1.xml
@@ -85,8 +85,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg" />
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg" />
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg" />
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg" />
   </section>
 
   <section name="INFRARED" prefix="IR_">
@@ -100,8 +100,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml b/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
index 43ab6f43d3..f77fb115e8 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
@@ -92,8 +92,8 @@ on<!DOCTYPE airframe SYSTEM "airframe.dtd">
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml b/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
index c2d96c56e8..73459dc2fe 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
@@ -66,8 +66,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(1.14591562748)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(3.38045096397)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="1.14591562748" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="3.38045096397" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml b/conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
index bcfb1746a2..468d45916c 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
@@ -69,8 +69,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml b/conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
index 1ba5fa8cb8..46d368aea6 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
@@ -70,8 +70,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="0.381000012159"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-9)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(3)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-9" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="3" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.5"/>
     <define name="CORRECTION_DOWN" value="1.5"/>
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml b/conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
index eebe325f76..dbec277f60 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
@@ -78,8 +78,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(3.49504256248)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.42247962952)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="3.49504256248" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="8.42247962952" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml b/conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
index 0cc4e9d929..5aad0acf1f 100644
--- a/conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
+++ b/conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
@@ -71,8 +71,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/overview.xml b/conf/airframes/ENAC/fixed-wing/overview.xml
index 37a71a4390..f376da0931 100644
--- a/conf/airframes/ENAC/fixed-wing/overview.xml
+++ b/conf/airframes/ENAC/fixed-wing/overview.xml
@@ -86,8 +86,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="rad"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="rad"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="rad"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0." unit="rad"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/ENAC/fixed-wing/soarzi.xml b/conf/airframes/ENAC/fixed-wing/soarzi.xml
index edb8ae06a7..ab7f242bbe 100644
--- a/conf/airframes/ENAC/fixed-wing/soarzi.xml
+++ b/conf/airframes/ENAC/fixed-wing/soarzi.xml
@@ -72,8 +72,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
index d31153b0d6..1036483158 100644
--- a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
@@ -93,8 +93,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad" />
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad" />
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="rad" />
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="rad" />
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
index cd728495d6..11be1e9b4c 100644
--- a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
@@ -97,8 +97,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad" />
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad" />
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="rad" />
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="rad" />
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index 91a8f3186e..959a400c62 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -101,8 +101,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-1.146)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.15)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-1.146" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0.15" unit="deg"/>
 
     <define name="I2C_DEFAULT_CONF" value="1"/>
   </section>
diff --git a/conf/airframes/LAAS/mmlaas_N1.xml b/conf/airframes/LAAS/mmlaas_N1.xml
index 9262144cb4..19bd277cb9 100644
--- a/conf/airframes/LAAS/mmlaas_N1.xml
+++ b/conf/airframes/LAAS/mmlaas_N1.xml
@@ -97,8 +97,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-2.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-2.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="8.6" unit="deg"/>
 
     <define name="HORIZ_SENSOR_TILTED" value="1"/>
     <define name="IR2_SIGN" value="1"/>
diff --git a/conf/airframes/LAAS/mmlaas_N2.xml b/conf/airframes/LAAS/mmlaas_N2.xml
index c418bae516..d9828c9bb3 100644
--- a/conf/airframes/LAAS/mmlaas_N2.xml
+++ b/conf/airframes/LAAS/mmlaas_N2.xml
@@ -93,8 +93,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-1.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-1.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="8.5" unit="deg"/>
 
     <define name="HORIZ_SENSOR_TILTED" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
diff --git a/conf/airframes/LAAS/mmlaas_N3.xml b/conf/airframes/LAAS/mmlaas_N3.xml
index a7a12c95e9..46bc09b2cf 100644
--- a/conf/airframes/LAAS/mmlaas_N3.xml
+++ b/conf/airframes/LAAS/mmlaas_N3.xml
@@ -93,8 +93,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(9)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="9" unit="deg"/>
 
     <define name="HORIZ_SENSOR_TILTED" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
diff --git a/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml b/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
index a5e370ee4f..4e10892cf5 100644
--- a/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
+++ b/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
@@ -95,8 +95,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="AUTO1" prefix="AUTO1_">
diff --git a/conf/airframes/Poine/easy_glider1.xml b/conf/airframes/Poine/easy_glider1.xml
index 239b8eeb32..44791bc811 100644
--- a/conf/airframes/Poine/easy_glider1.xml
+++ b/conf/airframes/Poine/easy_glider1.xml
@@ -65,8 +65,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="0.75"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(18)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="18" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/Poine/funjet42.xml b/conf/airframes/Poine/funjet42.xml
index d3f2fcf9b6..b1cce6838f 100644
--- a/conf/airframes/Poine/funjet42.xml
+++ b/conf/airframes/Poine/funjet42.xml
@@ -98,8 +98,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/Poine/swift_1.xml b/conf/airframes/Poine/swift_1.xml
index b95995394a..e736a7fe9d 100644
--- a/conf/airframes/Poine/swift_1.xml
+++ b/conf/airframes/Poine/swift_1.xml
@@ -92,8 +92,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml b/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
index 473b8ce2f4..96d2fce242 100644
--- a/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
+++ b/conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
@@ -49,8 +49,8 @@
   </command_laws>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="rad"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="rad"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="rad"/>
   </section>
 
   <section name="AUTO1" prefix="AUTO1_">
diff --git a/conf/airframes/TU_Delft/MicrojetBR.xml b/conf/airframes/TU_Delft/MicrojetBR.xml
index ed054642e8..ffafe387ba 100644
--- a/conf/airframes/TU_Delft/MicrojetBR.xml
+++ b/conf/airframes/TU_Delft/MicrojetBR.xml
@@ -62,8 +62,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.114591561258)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.0572957806289)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0.114591561258" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0.0572957806289" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/TU_Delft/Trip50A.xml b/conf/airframes/TU_Delft/Trip50A.xml
index bc19617cd2..0666e4fb0b 100644
--- a/conf/airframes/TU_Delft/Trip50A.xml
+++ b/conf/airframes/TU_Delft/Trip50A.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(18.9649028778)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="18.9649028778" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/TU_Delft/skywalkerfiber.xml b/conf/airframes/TU_Delft/skywalkerfiber.xml
index ae9e4b0a3b..a962c1f226 100644
--- a/conf/airframes/TU_Delft/skywalkerfiber.xml
+++ b/conf/airframes/TU_Delft/skywalkerfiber.xml
@@ -227,8 +227,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0." unit="deg"/>
   </section>
 
   <section name="MISC">
diff --git a/conf/airframes/delta_wing_minimal_example.xml b/conf/airframes/delta_wing_minimal_example.xml
index 6a8f6f9eb6..9cd56e7fe7 100644
--- a/conf/airframes/delta_wing_minimal_example.xml
+++ b/conf/airframes/delta_wing_minimal_example.xml
@@ -81,8 +81,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/demo_module.xml b/conf/airframes/demo_module.xml
index 60fbe18025..6c6b05f160 100644
--- a/conf/airframes/demo_module.xml
+++ b/conf/airframes/demo_module.xml
@@ -68,8 +68,8 @@
     <define name="IR2_SIGN"             value="1"/>
     <define name="TOP_SIGN"             value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT"  value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT"  value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0." unit="deg"/>
 
     <define name="CORRECTION_UP"    value="1."/>
     <define name="CORRECTION_DOWN"  value="1."/>
diff --git a/conf/airframes/easy_glider_example.xml b/conf/airframes/easy_glider_example.xml
index 39f706f1db..9bbb174eab 100644
--- a/conf/airframes/easy_glider_example.xml
+++ b/conf/airframes/easy_glider_example.xml
@@ -58,8 +58,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="0.75"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(18)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="18" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/easystar_ets_example.xml b/conf/airframes/easystar_ets_example.xml
index 857418cbff..775ab6dec7 100644
--- a/conf/airframes/easystar_ets_example.xml
+++ b/conf/airframes/easystar_ets_example.xml
@@ -84,8 +84,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(-3)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="-3" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/easystar_example.xml b/conf/airframes/easystar_example.xml
index edf7dfcb82..58c5b0c2e6 100644
--- a/conf/airframes/easystar_example.xml
+++ b/conf/airframes/easystar_example.xml
@@ -77,8 +77,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(-3)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="-3" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml
index 6e437fb551..67f58b3f8e 100644
--- a/conf/airframes/flixr_discovery.xml
+++ b/conf/airframes/flixr_discovery.xml
@@ -178,8 +178,8 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0.)"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0."/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0."/>
   </section>
 
 
diff --git a/conf/airframes/funjet_cam_example.xml b/conf/airframes/funjet_cam_example.xml
index 17fef0bc82..fb56a7b534 100644
--- a/conf/airframes/funjet_cam_example.xml
+++ b/conf/airframes/funjet_cam_example.xml
@@ -107,8 +107,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/funjet_example.xml b/conf/airframes/funjet_example.xml
index d5aa853a7f..af247be133 100644
--- a/conf/airframes/funjet_example.xml
+++ b/conf/airframes/funjet_example.xml
@@ -98,8 +98,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/jsbsim.xml b/conf/airframes/jsbsim.xml
index c3900f64fc..73e3f587d7 100644
--- a/conf/airframes/jsbsim.xml
+++ b/conf/airframes/jsbsim.xml
@@ -65,8 +65,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/mentor_tum.xml b/conf/airframes/mentor_tum.xml
index 154794f91c..df5cd797f7 100644
--- a/conf/airframes/mentor_tum.xml
+++ b/conf/airframes/mentor_tum.xml
@@ -109,8 +109,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(11.4591560364)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="11.4591560364" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/microjet_example.xml b/conf/airframes/microjet_example.xml
index 977d154b1a..fc8249b7c7 100644
--- a/conf/airframes/microjet_example.xml
+++ b/conf/airframes/microjet_example.xml
@@ -59,8 +59,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/mm/extra/press_t.xml b/conf/airframes/mm/extra/press_t.xml
index 8cd783434b..3073f74886 100644
--- a/conf/airframes/mm/extra/press_t.xml
+++ b/conf/airframes/mm/extra/press_t.xml
@@ -78,8 +78,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/mm/extra/probe_t.xml
index 989a98939a..01811ad4a0 100644
--- a/conf/airframes/mm/extra/probe_t.xml
+++ b/conf/airframes/mm/extra/probe_t.xml
@@ -100,8 +100,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/extra/turbine_trigger.xml b/conf/airframes/mm/extra/turbine_trigger.xml
index fc41222c5f..9effbb7af9 100644
--- a/conf/airframes/mm/extra/turbine_trigger.xml
+++ b/conf/airframes/mm/extra/turbine_trigger.xml
@@ -91,8 +91,8 @@
     <define name="IR1_SIGN" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml
index 7678f3c2ff..601e3fbfb1 100644
--- a/conf/airframes/mm/fixed-wing/drops.xml
+++ b/conf/airframes/mm/fixed-wing/drops.xml
@@ -109,8 +109,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/mm/fixed-wing/funjet43.xml b/conf/airframes/mm/fixed-wing/funjet43.xml
index be4b92af35..8b5ef239d1 100644
--- a/conf/airframes/mm/fixed-wing/funjet43.xml
+++ b/conf/airframes/mm/fixed-wing/funjet43.xml
@@ -94,8 +94,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="INFRARED" prefix="IR_">
@@ -112,8 +112,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetdca.xml b/conf/airframes/mm/fixed-wing/funjetdca.xml
index c702183d85..57904e0b7a 100644
--- a/conf/airframes/mm/fixed-wing/funjetdca.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdca.xml
@@ -117,8 +117,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetdcb.xml b/conf/airframes/mm/fixed-wing/funjetdcb.xml
index bc47d44b79..726d92b8a4 100644
--- a/conf/airframes/mm/fixed-wing/funjetdcb.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdcb.xml
@@ -117,8 +117,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetdcc.xml b/conf/airframes/mm/fixed-wing/funjetdcc.xml
index b048c2166f..375307d6d9 100644
--- a/conf/airframes/mm/fixed-wing/funjetdcc.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdcc.xml
@@ -117,8 +117,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjeteth1.xml b/conf/airframes/mm/fixed-wing/funjeteth1.xml
index 416ef73d29..a65932583a 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth1.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth1.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjeteth2.xml b/conf/airframes/mm/fixed-wing/funjeteth2.xml
index 773e7593d0..ab569e0540 100644
--- a/conf/airframes/mm/fixed-wing/funjeteth2.xml
+++ b/conf/airframes/mm/fixed-wing/funjeteth2.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(10)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="10" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/mm/fixed-wing/funjetfmi1.xml
index 1768dbda1c..bd39cefb89 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi1.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi1.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/mm/fixed-wing/funjetfmi2.xml
index 5387c779f1..6dd3339263 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi2.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi2.xml
@@ -73,8 +73,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/mm/fixed-wing/funjetfmi3.xml
index f855c51c85..a0bac989c2 100644
--- a/conf/airframes/mm/fixed-wing/funjetfmi3.xml
+++ b/conf/airframes/mm/fixed-wing/funjetfmi3.xml
@@ -73,8 +73,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/mm/fixed-wing/funjetgfi1.xml
index 8873787730..e6f10ef4eb 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi1.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi1.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
index 52b1d12471..b90be3eb3b 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi3.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi3.xml
@@ -53,8 +53,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="RollOfIrs" arity="2" coeff1="0.7" coeff2="-0.7"/>
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/mm/fixed-wing/funjetgfi4.xml
index 2d03f35669..e7326bcfe3 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi4.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi4.xml
@@ -73,8 +73,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(1)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="1" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/mm/fixed-wing/funjetgfi5.xml
index 5556666f3b..c2417140f0 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi5.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi5.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/mm/fixed-wing/funjetgfi6.xml
index f1be4edc40..ba7035b60e 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi6.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi6.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/mm/fixed-wing/funjetgfi7.xml
index 4e630d655d..2938facb71 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi7.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi7.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi8.xml b/conf/airframes/mm/fixed-wing/funjetgfi8.xml
index b762009294..484ea47451 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi8.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi8.xml
@@ -113,8 +113,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/mm/fixed-wing/funjetgfi9.xml
index eeec025ab5..4a10711d40 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi9.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi9.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetlisa.xml b/conf/airframes/mm/fixed-wing/funjetlisa.xml
index 5ee95e12dd..f466510bd0 100644
--- a/conf/airframes/mm/fixed-wing/funjetlisa.xml
+++ b/conf/airframes/mm/fixed-wing/funjetlisa.xml
@@ -99,8 +99,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetlisam.xml b/conf/airframes/mm/fixed-wing/funjetlisam.xml
index da0c1112a0..4c69b76590 100644
--- a/conf/airframes/mm/fixed-wing/funjetlisam.xml
+++ b/conf/airframes/mm/fixed-wing/funjetlisam.xml
@@ -99,8 +99,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetmm.xml b/conf/airframes/mm/fixed-wing/funjetmm.xml
index 65ed4e6dac..a83519cc58 100644
--- a/conf/airframes/mm/fixed-wing/funjetmm.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm.xml
@@ -143,8 +143,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/funjetmm2.xml b/conf/airframes/mm/fixed-wing/funjetmm2.xml
index 723049243e..61b63da805 100644
--- a/conf/airframes/mm/fixed-wing/funjetmm2.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm2.xml
@@ -77,8 +77,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml b/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
index 3800847e74..a49ab053c5 100644
--- a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
+++ b/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
@@ -103,8 +103,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
index 1edd3ef73c..86edca5120 100644
--- a/conf/airframes/mm/fixed-wing/merlin.xml
+++ b/conf/airframes/mm/fixed-wing/merlin.xml
@@ -72,8 +72,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/miniwing.xml b/conf/airframes/mm/fixed-wing/miniwing.xml
index aac74f357e..18705e7491 100644
--- a/conf/airframes/mm/fixed-wing/miniwing.xml
+++ b/conf/airframes/mm/fixed-wing/miniwing.xml
@@ -74,8 +74,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(3.4)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="3.4" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
index 6f4b15f05c..3c8721be19 100644
--- a/conf/airframes/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast.xml
@@ -91,8 +91,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="8.5" unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml
index 8b18ee2128..d4c4983651 100644
--- a/conf/airframes/mm/fixed-wing/slowfast2.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast2.xml
@@ -97,8 +97,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="8.5" unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/mm/fixed-wing/twinstarmm.xml b/conf/airframes/mm/fixed-wing/twinstarmm.xml
index 50e5cf040f..2449e4b47a 100644
--- a/conf/airframes/mm/fixed-wing/twinstarmm.xml
+++ b/conf/airframes/mm/fixed-wing/twinstarmm.xml
@@ -94,8 +94,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/mm/hangar/black_one.xml b/conf/airframes/mm/hangar/black_one.xml
index ace58e0e08..d7e6d06287 100644
--- a/conf/airframes/mm/hangar/black_one.xml
+++ b/conf/airframes/mm/hangar/black_one.xml
@@ -71,8 +71,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="RollOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
diff --git a/conf/airframes/mm/hangar/glass_one1.xml b/conf/airframes/mm/hangar/glass_one1.xml
index dca53ac196..82b92dedd8 100644
--- a/conf/airframes/mm/hangar/glass_one1.xml
+++ b/conf/airframes/mm/hangar/glass_one1.xml
@@ -58,8 +58,8 @@
     <linear name="RollOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="0.7" coeff2="0.7"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5.7)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5.7" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="TopOfIr" arity="1" coeff1="1"/>
diff --git a/conf/airframes/mm/hangar/glass_one2.xml b/conf/airframes/mm/hangar/glass_one2.xml
index 75fd916556..3848eadc40 100644
--- a/conf/airframes/mm/hangar/glass_one2.xml
+++ b/conf/airframes/mm/hangar/glass_one2.xml
@@ -52,8 +52,8 @@
     <linear name="RollOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="0.7" coeff2="0.7"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5.7)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5.7" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="TopOfIr" arity="1" coeff1="1"/>
diff --git a/conf/airframes/mm/hangar/glass_one3.xml b/conf/airframes/mm/hangar/glass_one3.xml
index 2050e503f2..834100ad89 100644
--- a/conf/airframes/mm/hangar/glass_one3.xml
+++ b/conf/airframes/mm/hangar/glass_one3.xml
@@ -59,8 +59,8 @@
     <linear name="RollOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="0.7" coeff2="0.7"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(10)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="10" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="TopOfIr" arity="1" coeff1="1"/>
diff --git a/conf/airframes/mm/hangar/lila.xml b/conf/airframes/mm/hangar/lila.xml
index 0f6638b031..1dd11c946a 100644
--- a/conf/airframes/mm/hangar/lila.xml
+++ b/conf/airframes/mm/hangar/lila.xml
@@ -75,8 +75,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="GYRO" prefix="GYRO_">
diff --git a/conf/airframes/mm/hangar/mac06a.xml b/conf/airframes/mm/hangar/mac06a.xml
index 7b6e5c3fa3..63dae8793b 100644
--- a/conf/airframes/mm/hangar/mac06a.xml
+++ b/conf/airframes/mm/hangar/mac06a.xml
@@ -57,8 +57,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(9)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="9" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="RollOfIrs" arity="2" coeff1="0.7" coeff2="-0.7"/>
diff --git a/conf/airframes/mm/hangar/red_one.xml b/conf/airframes/mm/hangar/red_one.xml
index 0b1ef0bf30..2c074fcba9 100644
--- a/conf/airframes/mm/hangar/red_one.xml
+++ b/conf/airframes/mm/hangar/red_one.xml
@@ -66,8 +66,8 @@
     <linear name="RollOfIrs" arity="2" coeff1="0.7" coeff2="-0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="0.7" coeff2="0.7"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-10.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-10." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="TopOfIr" arity="1" coeff1="1"/>
diff --git a/conf/airframes/obsolete/easystar2.xml b/conf/airframes/obsolete/easystar2.xml
index a90cd3de44..bc44601368 100644
--- a/conf/airframes/obsolete/easystar2.xml
+++ b/conf/airframes/obsolete/easystar2.xml
@@ -72,8 +72,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(-3)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="-3" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/hitl_usb.xml b/conf/airframes/obsolete/hitl_usb.xml
index 4633379bf3..653b66330c 100644
--- a/conf/airframes/obsolete/hitl_usb.xml
+++ b/conf/airframes/obsolete/hitl_usb.xml
@@ -15,8 +15,8 @@
 	<define name="LONGITUDINAL_CORRECTION" value="0.75"/>
 	<define name="VERTICAL_CORRECTION" value="1.5"/>
 
-	<define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-	<define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2)" unit="deg"/>
+	<define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+	<define name="PITCH_NEUTRAL_DEFAULT" value="2" unit="deg"/>
 
 	<define name="CORRECTION_UP" value="1.0"/>
 	<define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/kalscott_easystar.xml b/conf/airframes/obsolete/kalscott_easystar.xml
index 7153a4afe9..b56de424ca 100644
--- a/conf/airframes/obsolete/kalscott_easystar.xml
+++ b/conf/airframes/obsolete/kalscott_easystar.xml
@@ -59,8 +59,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(-3)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="-3" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/malolo_sim.xml b/conf/airframes/obsolete/malolo_sim.xml
index 2fb971afec..bed7e4dce1 100644
--- a/conf/airframes/obsolete/malolo_sim.xml
+++ b/conf/airframes/obsolete/malolo_sim.xml
@@ -69,8 +69,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/microjet5.xml b/conf/airframes/obsolete/microjet5.xml
index 8b987b59a0..5a7971bc76 100644
--- a/conf/airframes/obsolete/microjet5.xml
+++ b/conf/airframes/obsolete/microjet5.xml
@@ -68,8 +68,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/microjet5_tp_auto.xml b/conf/airframes/obsolete/microjet5_tp_auto.xml
index 64171a74f9..5e2287cacd 100644
--- a/conf/airframes/obsolete/microjet5_tp_auto.xml
+++ b/conf/airframes/obsolete/microjet5_tp_auto.xml
@@ -52,8 +52,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(9)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="9" unit="deg"/>
     <linear name="RollOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="-0.7" coeff2="-0.7"/>
     <linear name="TopOfIr" arity="1" coeff1="1"/>
diff --git a/conf/airframes/obsolete/microjet6.xml b/conf/airframes/obsolete/microjet6.xml
index 5791cc3438..71f9184796 100644
--- a/conf/airframes/obsolete/microjet6.xml
+++ b/conf/airframes/obsolete/microjet6.xml
@@ -66,8 +66,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(4.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="4." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/microjetI.xml b/conf/airframes/obsolete/microjetI.xml
index 469c70d153..1be67762ec 100644
--- a/conf/airframes/obsolete/microjetI.xml
+++ b/conf/airframes/obsolete/microjetI.xml
@@ -62,8 +62,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/microjetII.xml b/conf/airframes/obsolete/microjetII.xml
index 3b1cf0c400..913e68d99b 100644
--- a/conf/airframes/obsolete/microjetII.xml
+++ b/conf/airframes/obsolete/microjetII.xml
@@ -63,8 +63,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(1.2)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="1.2" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/microjetIII.xml b/conf/airframes/obsolete/microjetIII.xml
index 1bc5db1a22..4697f6e2cc 100644
--- a/conf/airframes/obsolete/microjetIII.xml
+++ b/conf/airframes/obsolete/microjetIII.xml
@@ -63,8 +63,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.15)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.15" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/microjet_raw_makefile.xml b/conf/airframes/obsolete/microjet_raw_makefile.xml
index 41f706d212..28b71fef98 100644
--- a/conf/airframes/obsolete/microjet_raw_makefile.xml
+++ b/conf/airframes/obsolete/microjet_raw_makefile.xml
@@ -73,8 +73,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-3.6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-3.6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/minimag1.xml b/conf/airframes/obsolete/minimag1.xml
index 4719c50ac1..ca7a519a97 100644
--- a/conf/airframes/obsolete/minimag1.xml
+++ b/conf/airframes/obsolete/minimag1.xml
@@ -70,8 +70,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="-1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/minimag_fs.xml b/conf/airframes/obsolete/minimag_fs.xml
index b210beab95..2f73162216 100644
--- a/conf/airframes/obsolete/minimag_fs.xml
+++ b/conf/airframes/obsolete/minimag_fs.xml
@@ -70,8 +70,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-12)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(9)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-12" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="9" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
index 32f11883bb..fc0c478d96 100644
--- a/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
+++ b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
@@ -57,9 +57,9 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-2.6)" unit="deg"/>
-<!--    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(8.6)" unit="deg"/>-->
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(10.6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-2.6" unit="deg"/>
+<!--    <define name="PITCH_NEUTRAL_DEFAULT" value="8.6" unit="deg"/>-->
+    <define name="PITCH_NEUTRAL_DEFAULT" value="10.6" unit="deg"/>
 
     <linear name="RollOfIrs" arity="2" coeff1="0.7" coeff2="0.7"/>
     <linear name="PitchOfIrs" arity="2" coeff1="-0.7" coeff2="0.7"/>
diff --git a/conf/airframes/obsolete/osam_xsens_twog.xml b/conf/airframes/obsolete/osam_xsens_twog.xml
index 9e35f0b1ac..ecbbaac663 100644
--- a/conf/airframes/obsolete/osam_xsens_twog.xml
+++ b/conf/airframes/obsolete/osam_xsens_twog.xml
@@ -109,8 +109,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1.16"/>
     <define name="VERTICAL_CORRECTION" value="1.0"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.73)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5.73)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.73" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5.73" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
@@ -119,8 +119,8 @@
   </section>
 
   <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.73)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(5.73)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.73" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="5.73" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/obsolete/slayer1.xml b/conf/airframes/obsolete/slayer1.xml
index 0e738cffd6..d44389ac6e 100644
--- a/conf/airframes/obsolete/slayer1.xml
+++ b/conf/airframes/obsolete/slayer1.xml
@@ -57,8 +57,8 @@
     <define name="ADC_IR2_NEUTRAL" value="-16"/>
     <define name="ADC_TOP_NEUTRAL" value="533"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <linear name="RollOfIrs" arity="2" coeff1=".5" coeff2="0.5"/>
     <linear name="PitchOfIrs" arity="2" coeff1="-0.5" coeff2="0.5"/>
diff --git a/conf/airframes/obsolete/slayer3.xml b/conf/airframes/obsolete/slayer3.xml
index f3676b91c7..b6f57d2451 100644
--- a/conf/airframes/obsolete/slayer3.xml
+++ b/conf/airframes/obsolete/slayer3.xml
@@ -51,8 +51,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
     <linear name="RollOfIrs" arity="2" coeff1=".5" coeff2="0.5"/>
diff --git a/conf/airframes/obsolete/slayerJH.xml b/conf/airframes/obsolete/slayerJH.xml
index be95600d62..2cec49a721 100644
--- a/conf/airframes/obsolete/slayerJH.xml
+++ b/conf/airframes/obsolete/slayerJH.xml
@@ -48,8 +48,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(11.4)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="11.4" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/> <!-- Contrast used prior to capture on models without z-sensor -->
     <define name="HORIZ_SENSOR_TILTED" value="1"/> <!-- "0" indicates x-y sensor is aligned with the fueslage, "1" indicates a 45 deg rotation -->
     <define name="IR1_SIGN" value="-1"/>
diff --git a/conf/airframes/obsolete/slicer1.xml b/conf/airframes/obsolete/slicer1.xml
index a9ee1174ed..784f96a463 100644
--- a/conf/airframes/obsolete/slicer1.xml
+++ b/conf/airframes/obsolete/slicer1.xml
@@ -76,8 +76,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1.0"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-4)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-4" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/slicer2.xml b/conf/airframes/obsolete/slicer2.xml
index c9180dee2d..2705338724 100644
--- a/conf/airframes/obsolete/slicer2.xml
+++ b/conf/airframes/obsolete/slicer2.xml
@@ -70,8 +70,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1.0"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-7)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-7" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/spirit.xml b/conf/airframes/obsolete/spirit.xml
index d0c07cd138..ed3b0b5b42 100644
--- a/conf/airframes/obsolete/spirit.xml
+++ b/conf/airframes/obsolete/spirit.xml
@@ -73,8 +73,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1.0039999485"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6.47442293167)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12.261297226)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6.47442293167" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12.261297226" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/spirit_proto.xml b/conf/airframes/obsolete/spirit_proto.xml
index d0f8f0ff8f..108e8b940f 100644
--- a/conf/airframes/obsolete/spirit_proto.xml
+++ b/conf/airframes/obsolete/spirit_proto.xml
@@ -72,8 +72,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1.0039999485"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6.47442293167)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12.261297226)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6.47442293167" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12.261297226" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/storm1.xml b/conf/airframes/obsolete/storm1.xml
index 217f5f63f9..aa4eb82ea4 100644
--- a/conf/airframes/obsolete/storm1.xml
+++ b/conf/airframes/obsolete/storm1.xml
@@ -60,8 +60,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-17)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(4.2)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-17" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="4.2" unit="deg"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
     <define name="RAD_OF_IR_CONTRAST" value="0.75"/>
 
diff --git a/conf/airframes/obsolete/tiny2.xml b/conf/airframes/obsolete/tiny2.xml
index d02fcaef03..d18fb4a59b 100644
--- a/conf/airframes/obsolete/tiny2.xml
+++ b/conf/airframes/obsolete/tiny2.xml
@@ -70,8 +70,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(12)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="12" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/tiny_hitl.xml b/conf/airframes/obsolete/tiny_hitl.xml
index 85a7a85b1b..b784c66a5f 100644
--- a/conf/airframes/obsolete/tiny_hitl.xml
+++ b/conf/airframes/obsolete/tiny_hitl.xml
@@ -65,8 +65,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="0.75"/>
     <define name="VERTICAL_CORRECTION" value="1.5"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0.)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(2)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0." unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="2" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1.0"/>
     <define name="CORRECTION_DOWN" value="1.0"/>
diff --git a/conf/airframes/obsolete/twinjet1.xml b/conf/airframes/obsolete/twinjet1.xml
index 785563b237..8c2450f8d4 100644
--- a/conf/airframes/obsolete/twinjet1.xml
+++ b/conf/airframes/obsolete/twinjet1.xml
@@ -58,8 +58,8 @@
     <define name="IR1_SIGN" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(10)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="10" unit="deg"/>
 
     <define name="LATERAL_CORRECTION" value="1."/>
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
diff --git a/conf/airframes/obsolete/twinstar1.xml b/conf/airframes/obsolete/twinstar1.xml
index 8356a46a35..94e676fbfb 100644
--- a/conf/airframes/obsolete/twinstar1.xml
+++ b/conf/airframes/obsolete/twinstar1.xml
@@ -48,8 +48,8 @@
   </section>
 
   <section name="INFRARED" prefix="IR_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
     <define name="ADC_ROLL_NEUTRAL" value="-1005"/>
     <define name="ADC_PITCH_NEUTRAL" value="75"/>
     <define name="DEFAULT_CONTRAST" value="200"/>
diff --git a/conf/airframes/obsolete/twinstar6.xml b/conf/airframes/obsolete/twinstar6.xml
index 8c8262b9ed..30aeb79607 100644
--- a/conf/airframes/obsolete/twinstar6.xml
+++ b/conf/airframes/obsolete/twinstar6.xml
@@ -80,8 +80,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-5.5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(9.5)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-5.5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="9.5" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/tyto1.xml b/conf/airframes/obsolete/tyto1.xml
index f7104d740d..049cea6a4f 100644
--- a/conf/airframes/obsolete/tyto1.xml
+++ b/conf/airframes/obsolete/tyto1.xml
@@ -76,8 +76,8 @@
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
     <define name="VERTICAL_CORRECTION" value="1."/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(-6)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(6)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="-6" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="6" unit="deg"/>
 
     <define name="CORRECTION_UP" value="1."/>
     <define name="CORRECTION_DOWN" value="1."/>
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
index b2a0423b23..972d9e9809 100644
--- a/conf/airframes/obsolete/xxx1.xml
+++ b/conf/airframes/obsolete/xxx1.xml
@@ -62,8 +62,8 @@
     <define name="ADC_IR2_NEUTRAL" value="512"/>
     <define name="ADC_TOP_NEUTRAL" value="512"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(3)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="3" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
 
     <define name="HORIZ_SENSOR_TILTED" value="1"/>
     <define name="IR1_SIGN" value="-1"/>
diff --git a/conf/airframes/test_hb.xml b/conf/airframes/test_hb.xml
index 91ca3f0307..c3b11a5df8 100644
--- a/conf/airframes/test_hb.xml
+++ b/conf/airframes/test_hb.xml
@@ -112,8 +112,8 @@
   </section>
 
   <section name="INS" prefix="INS_" >
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0"/>
   </section>
 
   <section name="AUTO1" prefix="AUTO1_">
diff --git a/conf/airframes/twinjet_example.xml b/conf/airframes/twinjet_example.xml
index 4204d3e0dc..b85661fb78 100644
--- a/conf/airframes/twinjet_example.xml
+++ b/conf/airframes/twinjet_example.xml
@@ -88,8 +88,8 @@
     <define name="IR1_SIGN" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(10)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="10" unit="deg"/>
 
     <define name="LATERAL_CORRECTION" value="1."/>
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
index 86d1bcfb68..3d2ab37504 100644
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/twinjet_overo.xml
@@ -96,8 +96,8 @@
     <define name="IR1_SIGN" value="1"/>
     <define name="IR2_SIGN" value="-1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(5)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(10)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="5" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="10" unit="deg"/>
 
     <define name="LATERAL_CORRECTION" value="1."/>
     <define name="LONGITUDINAL_CORRECTION" value="1."/>
diff --git a/conf/airframes/twinstar_example.xml b/conf/airframes/twinstar_example.xml
index 89821a2120..6d75ce1171 100644
--- a/conf/airframes/twinstar_example.xml
+++ b/conf/airframes/twinstar_example.xml
@@ -112,8 +112,8 @@
     <define name="IR2_SIGN" value="-1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="0" unit="deg"/>
   </section>
 
   <section name="BAT">
diff --git a/conf/airframes/usb_test.xml b/conf/airframes/usb_test.xml
index 3529a10147..519b6dddc1 100644
--- a/conf/airframes/usb_test.xml
+++ b/conf/airframes/usb_test.xml
@@ -93,8 +93,8 @@
     <define name="IR2_SIGN" value="1"/>
     <define name="TOP_SIGN" value="1"/>
 
-    <define name="ROLL_NEUTRAL_DEFAULT" value="RadOfDeg(0)" unit="deg"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="RadOfDeg(1)" unit="deg"/>
+    <define name="ROLL_NEUTRAL_DEFAULT" value="0" unit="deg"/>
+    <define name="PITCH_NEUTRAL_DEFAULT" value="1" unit="deg"/>
   </section>
 
   <section name="BAT">