diff --git a/conf/airframes/AirborneCodeReorg/TinyFw.xml b/conf/airframes/AirborneCodeReorg/TinyFw.xml
index 15f419edf2..e67e97d6f3 100644
--- a/conf/airframes/AirborneCodeReorg/TinyFw.xml
+++ b/conf/airframes/AirborneCodeReorg/TinyFw.xml
@@ -152,21 +152,11 @@
     </section>
 
   <section name="FAILSAFE" prefix="FAILSAFE_">
-      <define name="DELAY_WITHOUT_GPS" value="1" unit="s"/>
+	<define name="DELAY_WITHOUT_GPS" value="1" unit="s"/>
     	<define name="DEFAULT_THROTTLE" value="0.3" unit="%"/>
     	<define name="DEFAULT_ROLL" value="0.3" unit="rad"/>
     	<define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
-	    <define name="HOME_RADIUS" value="100" unit="m"/>
-  </section>
-
-  <section name="EXTRA_IO" >
-    <define name="LED_6_BANK" value="0" />
-    <define name="LED_6_PIN" value="2" />
-    <define name="LED_7_BANK" value="0" />
-    <define name="LED_7_PIN" value="3" />
-  </section>
-  <section name="DIFITAL_CAMERA" prefix="DC_" >
-    <define name="AUTOSHOOT_QUARTERSEC_PERIOD" value="6" unit="quarter_sec" />
+	<define name="HOME_RADIUS" value="100" unit="m"/>
   </section>
 
   <modules>
@@ -176,12 +166,6 @@
       <param name="STROBE_LIGHT_MODE_DEFAULT" value="6"/>
       <param name="NAV_LIGHT_MODE_DEFAULT" value="0"/>
     </load>
-    
-    <load name="digital_cam.xml">
-      <flag name="DC_SHUTTER_LED" value="6" />
-      <flag name="DC_ZOOM_IN_LED" value="7" />
-    </load>
-    
   </modules>
 
   <firmware name="fixedwing">
diff --git a/sw/airborne/boards/tiny_1.1.h b/sw/airborne/boards/tiny_1.1.h
index 19c9ac0113..9f0d40070e 100644
--- a/sw/airborne/boards/tiny_1.1.h
+++ b/sw/airborne/boards/tiny_1.1.h
@@ -123,10 +123,7 @@
 #endif
 #define USE_AD1_6
 
-
-#ifndef VoltageOfAdc
-#define VoltageOfAdc(adc) (0.01787109375*adc)
-#endif
+#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
 
 #define SPI_SELECT_SLAVE0_PORT 0
 #define SPI_SELECT_SLAVE0_PIN 20