diff --git a/conf/airframes/FLIXR/flixr_conf.xml b/conf/airframes/FLIXR/flixr_conf.xml
index fd799c2475..fbfcbe304d 100644
--- a/conf/airframes/FLIXR/flixr_conf.xml
+++ b/conf/airframes/FLIXR/flixr_conf.xml
@@ -82,8 +82,8 @@
    airframe="airframes/untested/quad_cc3d.xml"
    radio="radios/dummy.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/rotorcraft_basic.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/control/rotorcraft_guidance.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml"
+   flight_plan="flight_plans/dummy.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/estimation/ahrs_int_cmpl_quat.xml settings/estimation/body_to_imu.xml"
    settings_modules=""
    gui_color="blue"
   />
diff --git a/conf/airframes/untested/quad_cc3d.xml b/conf/airframes/untested/quad_cc3d.xml
index cf1d4b6cc6..a62b9a697e 100644
--- a/conf/airframes/untested/quad_cc3d.xml
+++ b/conf/airframes/untested/quad_cc3d.xml
@@ -24,7 +24,6 @@
     </subsystem>
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="stabilization" type="int_quat"/>
-    <subsystem name="gps"           type="ublox"/>
     <subsystem name="imu"           type="mpu6000"/>
     <subsystem name="ahrs"          type="int_cmpl_quat">
       <define name="AHRS_GRAVITY_HEURISTIC_FACTOR" value="30"/>
@@ -53,9 +52,6 @@
     <target name="test_actuators_pwm" board="cc3d"/>
   </firmware>
 
-  <modules main_freq="512">
-  </modules>
-
   <servos driver="Pwm">
     <servo name="FL"   no="0" min="1000" neutral="1100" max="2000"/>
     <servo name="FR"   no="1" min="1000" neutral="1100" max="2000"/>