diff --git a/conf/airframes/CDW/cdw_classix.xml b/conf/airframes/CDW/cdw_classix.xml
deleted file mode 100644
index 92a57fc01b..0000000000
--- a/conf/airframes/CDW/cdw_classix.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<!DOCTYPE airframe SYSTEM "../airframe.dtd">
-
-<airframe name="TwinStarXSens">
-
-  <servos driver="Ppm">
-    <servo name="THROTTLE_LEFT" no="1" min="1100" neutral="1100" max="1900"/>
-    <servo name="THROTTLE_RIGHT" no="0" min="1100" neutral="1100" max="1900"/>
-    <servo name="AILERON_RIGHT" no="2" min="2300" neutral="1550" max="700"/>
-    <servo name="AILERON_LEFT" no="3" min="2300" neutral="1550" max="700"/>
-    <servo name="ELEVATOR" no="4" min="1100" neutral="1500" max="1900"/>
-  </servos>
-
-  <commands>
-    <axis name="THROTTLE" failsafe_value="0"/>
-    <axis name="ROLL" failsafe_value="0"/>
-    <axis name="PITCH" failsafe_value="0"/>
-    <axis name="YAW" failsafe_value="0"/>
-    <axis name="BRAKE" failsafe_value="0"/>
-  </commands>
-
-  <rc_commands>
-    <set command="THROTTLE" value="@THROTTLE"/>
-    <set command="ROLL" value="@ROLL"/>
-    <set command="PITCH" value="@PITCH"/>
-    <set command="BRAKE" value="@YAW"/>
-  </rc_commands>
-
-  <section name="SERVO_MIXER_GAINS">
-    <define name="AILERON_RATE_UP" value="0.50f"/>
-    <define name="AILERON_RATE_DOWN" value="0.25f"/>
-
-    <define name="AILERON_RATE_UP_BRAKE" value="0.5f"/>
-    <define name="AILERON_RATE_DOWN_BRAKE" value="0.9f"/>
-
-    <define name="PITCH_GAIN" value="0.9f"/>
-
-    <define name="YAW_THRUST" value="0.0f"/>
-    <define name="BRAKE_AILEVON" value="-0.68f"/>
-    <define name="BRAKE_PITCH" value="0.0f"/>
-    <define name="MAX_BRAKE_RATE" value="130"/>
-  </section>
-
-  <command_laws>
-    <!-- Brake Rate Limiter -->
-    <let var="brake_value_nofilt" value="Chop(-@BRAKE, 0, MAX_PPRZ)"/>
-    <ratelimit var="brake_value" value="$brake_value_nofilt" rate_min="-MAX_BRAKE_RATE" rate_max="MAX_BRAKE_RATE" />
-
-    <!-- Differential Aileron Depending on Brake Value -->
-    <let var="aileron_up_rate" value="(AILERON_RATE_UP   * (MAX_PPRZ - $brake_value)) + (AILERON_RATE_UP_BRAKE   * $brake_value)"/>
-    <let var="aileron_down_rate" value="(AILERON_RATE_DOWN * (MAX_PPRZ - $brake_value)) + (AILERON_RATE_DOWN_BRAKE * $brake_value)"/>
-    <let var="aileron_up" value="((-@ROLL)  *  (((float)$aileron_up_rate) / ((float)MAX_PPRZ)))"/>
-    <let var="aileron_down" value="((-@ROLL)  * (((float)$aileron_down_rate) / ((float)MAX_PPRZ)))"/>
-    <let var="leftturn" value="((-@ROLL) >= 0? 1 : 0)"/>
-    <let var="rightturn" value="(1 - $leftturn)"/>
-    <set servo="AILERON_LEFT" value="($aileron_up * $leftturn) + ($aileron_down * $rightturn) - $brake_value*(BRAKE_AILEVON)"/>
-    <set servo="AILERON_RIGHT" value="($aileron_up * $rightturn) + ($aileron_down * $leftturn) + $brake_value*(BRAKE_AILEVON)"/>
-
-    <!-- Differential Thurst -->
-    <set servo="THROTTLE_LEFT" value="@THROTTLE - @ROLL * (YAW_THRUST)"/>
-    <set servo="THROTTLE_RIGHT" value="@THROTTLE + @ROLL * (YAW_THRUST)"/>
-
-    <!-- Pitch with Brake-Trim Function -->
-    <set servo="ELEVATOR" value="-@PITCH * PITCH_GAIN + BRAKE_PITCH * $brake_value"/>
-  </command_laws>
-
-  <section name="AUTO1" prefix="AUTO1_">
-    <define name="MAX_ROLL" value="0.7"/>
-    <define name="MAX_PITCH" value="0.7"/>
-  </section>
-
-  <section name="INS" prefix="INS_">
-    <define name="ROLL_NEUTRAL_DEFAULT" value="0"/>
-    <define name="PITCH_NEUTRAL_DEFAULT" value="0"/>
-  </section>
-
-  <section name="AHRS" prefix="AHRS_">
-    <!-- Local magnetic field -->
-    <define name="H_X" value="0.51562740288882"/>
-    <define name="H_Y" value="-0.05707735220832"/>
-    <define name="H_Z" value="0.85490967783446"/>
-  </section>
-
-  <section name="XSENS">
-    <define name="GPS_IMU_LEVER_ARM_X" value="0.0f"/>
-    <define name="GPS_IMU_LEVER_ARM_Y" value="0.0f"/>
-    <define name="GPS_IMU_LEVER_ARM_Z" value="0.0f"/>
-  </section>
-
-
-  <section name="ADC" prefix="ADC_CHANNEL_">
-    <define name="CURRENT" value="AdcBank1(5)"/>
-  </section>
-
-  <section name="BAT">
-    <define name="VoltageOfAdc(adc)" value="(0.01688000f*(adc)+2)"/>
-    <define name="MilliAmpereOfAdc(adc)" value="((adc) - 505) * 124.0f"/>
-
-    <define name="LOW_BAT_LEVEL" value="10.5" unit="V"/>
-    <define name="CRITIC_BAT_LEVEL" value="10" unit="V"/>
-    <define name="CATASTROPHIC_BAT_LEVEL" value="9.1" unit="V"/>
-  </section>
-
-  <section name="FAILSAFE" prefix="FAILSAFE_">
-    <define name="DEFAULT_THROTTLE" value="0.45" unit="%"/>
-    <define name="DEFAULT_ROLL" value="0.17" unit="rad"/>
-    <define name="DEFAULT_PITCH" value="0.08" unit="rad"/>
-
-    <define name="HOME_RADIUS" value="DEFAULT_CIRCLE_RADIUS" unit="m"/>
-    <define name="KILL_MODE_DISTANCE" value="(MAX_DIST_FROM_HOME*1.5)"/>
-    <define name="DELAY_WITHOUT_GPS" value="3" unit="s"/>
-  </section>
-
-  <section name="HORIZONTAL CONTROL" prefix="H_CTL_">
-    <define name="COURSE_PGAIN" value="0.75"/>
-    <define name="COURSE_DGAIN" value="0.45"/>
-    <define name="COURSE_PRE_BANK_CORRECTION" value="0.935"/>
-
-    <define name="ROLL_MAX_SETPOINT" value="0.8" unit="radians"/>
-    <define name="PITCH_MAX_SETPOINT" value="0.4" unit="radians"/>
-    <define name="PITCH_MIN_SETPOINT" value="-0.275" unit="radians"/>
-
-    <define name="PITCH_PGAIN" value="11000"/>
-    <define name="PITCH_DGAIN" value="0."/>
-    <define name="ELEVATOR_OF_ROLL" value="1000."/>
-
-    <!--  roll rate loop -->
-    <define name="ROLL_ATTITUDE_GAIN" value="7000."/>
-    <define name="ROLL_RATE_GAIN" value="1100"/>
-  </section>
-
-
- <section name="VERTICAL CONTROL" prefix="V_CTL_">
-    <!-- outer loop proportional gain -->
-    <define name="ALTITUDE_PGAIN" value="0.1"/>
-
-    <!-- outer loop saturation -->
-    <define name="ALTITUDE_MAX_CLIMB" value="3.0"/>
-
-    <!-- auto throttle inner loop -->
-    <define name="AUTO_THROTTLE_MIN_CRUISE_THROTTLE" value=".38"/>
-    <define name="AUTO_THROTTLE_NOMINAL_CRUISE_THROTTLE" value="0.45"/>
-    <define name="AUTO_THROTTLE_MAX_CRUISE_THROTTLE" value="0.62"/>
-
-    <define name="AUTO_THROTTLE_LOITER_TRIM" value="1000."/>
-    <define name="AUTO_THROTTLE_DASH_TRIM" value="-1500"/>
-
-    <define name="AUTO_THROTTLE_CLIMB_THROTTLE_INCREMENT" value="0.2" unit="%/(m/s)"/>
-    <define name="AUTO_THROTTLE_PGAIN" value="0."/>
-    <define name="AUTO_THROTTLE_IGAIN" value="0."/>
-    <define name="AUTO_THROTTLE_PITCH_OF_VZ_PGAIN" value="0.175"/>
-
-    <define name="THROTTLE_SLEW_LIMITER" value="1" unit="s"/>
-  </section>
-
-  <section name="NAV">
-    <define name="AGR_CLIMB_PITCH" value="0."/> <!-- Needed For OSAMNav -->
-  </section>
-
-  <section name="MISC">
-    <define name="NOMINAL_AIRSPEED" value="15." unit="m/s"/>
-    <define name="CARROT" value="5." unit="s"/>
-    <define name="CONTROL_FREQUENCY" value="60" unit="Hz"/>
-
-    <define name="DEFAULT_CIRCLE_RADIUS" value="75."/>
-
-    <define name="GLIDE_AIRSPEED" value="10"/>
-    <define name="GLIDE_PITCH" value="45" unit="deg"/>
-
-    <define name="COMMAND_ROLL_TRIM" value="180"/>
-    <define name="COMMAND_PITCH_TRIM" value="-194."/>
-  </section>
-
-  <section name="DIGITAL_CAMERA" prefix="DC_">
-    <define name="AUTOSHOOT_PERIOD" value="2.0" unit="sec"/>
-    <define name="AUTOSHOOT_DISTANCE_INTERVAL" value="50" unit="meter"/>
-  </section>
-
-  <firmware name="fixedwing">
-
-    <target name="ap" board="classix">
-      <configure name="SYS_TIME_LED" value="2"/>
-
-      <define name="USE_AD0"/>
-      <define name="USE_AD0_3"/>
-      <define name="ADC_6" value="AdcBank0\(3\)"/>
-
-      <module name="control"/>
-      <module name="navigation"/>
-    </target>
-
-    <target name="fbw" board="classix">
-      <configure name="SYS_TIME_LED" value="2"/>
-      <define name="RADIO_CONTROL_LED" value="1"/>
-      <define name="USE_AD1_5" value="1"/>
-      <define name="USE_AD1" value="1"/>
-      <configure name="ACTUATORS" value="actuators_ppm"/>
-      <define name="ADC_CHANNEL_VSUPPLY" value="AdcBank0\(6\)"/>
-    </target>
-
-    <target name="sim" board="pc">
-      <module name="control"/>
-      <module name="navigation"/>
-    </target>
-
-    <define name="DC_IMAGE_BUFFER" value="65000" />
-    <define name="STRONG_WIND"/>
-    <define name="WIND_INFO"/>
-    <define name="WIND_INFO_RET"/>
-    <define name="LOITER_TRIM"/>
-    <define name="RADIO_CONTROL_AUTO1"/>
-
-    <module name="radio_control" type="ppm"/>
-
-    <module name="telemetry" type="xbee_api">
-      <configure name="MODEM_PORT" value="UART0"/>
-      <configure name="MODEM_BAUD" value="B9600"/>
-    </module>
-
-    <module name="ins" type="xsens">
-      <configure name="XSENS_PORT" value="uart1"/>
-    </module>
-
-  </firmware>
-
-  <modules>
-    <module name="digital_cam">
-      <define name="DC_SHUTTER_GPIO" value="GPIOA,GPIO15"/>
-   </module>
-   <module name="adc_generic">
-      <define name="ADC_CHANNEL_GENERIC_NB_SAMPLES" value="32"/>
-      <configure name="ADC_CHANNEL_GENERIC1" value="ADC_6"/> <!-- e.g. current sensor -->
-   </module>
-   <module name="photogrammetry_calculator" />
-    <module name="nav" type="line"/>
-  </modules>
-
-<!--+-+-+-+-+-+-+- PHOTOGRAMMETRY -+-+-+-+-+-+-+-->
-
-
-  <section name="Photogrammetry" prefix="PHOTOGRAMMETRY_">
-    <!-- Camera Parameters -->
-    <define name="FOCAL_LENGTH" value="20" unit="mm"/>
-    <define name="SENSOR_WIDTH" value="24" unit="mm"/>
-    <define name="SENSOR_HEIGHT" value="13.5" unit="mm"/>
-    <define name="PIXELS_WIDTH" value="1280" unit=""/>
-
-    <!-- Flight Safety Parameters -->
-    <define name="HEIGHT_MIN" value="40" unit="m"/>
-    <define name="HEIGHT_MAX" value="300" unit="m"/>
-    <define name="RADIUS_MIN" value="70" unit="m"/>
-
-  </section>
-
-
-</airframe>
diff --git a/conf/boards/classix.makefile b/conf/boards/classix.makefile
deleted file mode 100644
index 6ad3d6e586..0000000000
--- a/conf/boards/classix.makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# classix.makefile
-#
-# http://wiki.paparazziuav.org/wiki/Classix
-#
-
-ARCH=lpc21
-
-
-BOARD=classix
-BOARD_VERSION=1.0
-
-BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
-
-# default flash mode is via usb bootloader
-FLASH_MODE ?= IAP
-
-
-LPC21ISP_BAUD = 38400
-LPC21ISP_XTAL = 12000
-
-
-# All targets on the TINY board run on the same processor achitecture
-$(TARGET).ARCHDIR = $(ARCH)
-
-# Battery Voltage
-fbw.CFLAGS +=  -DUSE_AD0
-
-#
-# default LED configuration
-#
-RADIO_CONTROL_LED ?= none
-BARO_LED          ?= none
-AHRS_ALIGNER_LED  ?= none
-GPS_LED           ?= none
-SYS_TIME_LED      ?= none
-
-### default settings for classix
-GPS_BAUD ?= B38400
-
-
-#
-# you can use different actuators by adding a configure option to your firmware section
-# e.g. <configure name="ACTUATORS" value="actuators_ppm/>
-# and by setting the correct "driver" attribute in servo section
-# e.g. <servo driver="Ppm">
-#
-ACTUATORS ?= actuators_pwm
-
-# always enable SEPARATE_FBW
-SEPARATE_FBW = 1
diff --git a/conf/conf_tests.xml b/conf/conf_tests.xml
index 792150e6e3..45c638fe71 100644
--- a/conf/conf_tests.xml
+++ b/conf/conf_tests.xml
@@ -21,17 +21,6 @@
    settings_modules=""
    gui_color="blue"
   />
-  <aircraft
-   name="Classix_XSens"
-   ac_id="33"
-   airframe="airframes/CDW/cdw_classix.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_fixedwing_imu_9k6.xml"
-   flight_plan="flight_plans/versatile.xml"
-   settings="settings/fixedwing_basic.xml settings/control/ctl_basic.xml"
-   settings_modules="modules/digital_cam.xml modules/photogrammetry_calculator.xml"
-   gui_color="blue"
-  />
   <aircraft
    name="DualBoard_AP_FBW"
    ac_id="31"
diff --git a/conf/firmwares/fixedwing.makefile b/conf/firmwares/fixedwing.makefile
index e89c0d512e..8b64128804 100644
--- a/conf/firmwares/fixedwing.makefile
+++ b/conf/firmwares/fixedwing.makefile
@@ -26,11 +26,7 @@ VPATH += $(PAPARAZZI_HOME)/var/share
 include $(CFG_FIXEDWING)/autopilot.makefile
 
 # automatically include correct actuators for the ap target
-ifeq ($(BOARD),classix)
-  ACTUATOR_TARGET = fbw
-else
-  ACTUATOR_TARGET = ap
-endif
+ACTUATOR_TARGET = ap
 
 ifeq ($(TARGET),$(ACTUATOR_TARGET))
 
diff --git a/conf/firmwares/subsystems/fixedwing/autopilot.makefile b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
index 5d196f1d8a..b4d8f5620b 100644
--- a/conf/firmwares/subsystems/fixedwing/autopilot.makefile
+++ b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
@@ -212,14 +212,11 @@ sim.srcs        += $(SRC_ARCH)/sim_ahrs.c $(SRC_ARCH)/sim_ir.c
 # SINGLE MCU / DUAL MCU
 #
 
-ifeq ($(BOARD),classix)
-  include $(CFG_FIXEDWING)/intermcu_spi.makefile
-else
-  # Single MCU's run both
-  ifeq ($(SEPARATE_FBW),)
-    ap.CFLAGS 		+= $(fbw_CFLAGS)
-    ap.srcs 		+= $(fbw_srcs)
-  endif
+
+# Single MCU's run both
+ifeq ($(SEPARATE_FBW),)
+  ap.CFLAGS 		+= $(fbw_CFLAGS)
+  ap.srcs 		+= $(fbw_srcs)
 endif
 
 #
diff --git a/conf/firmwares/subsystems/shared/actuators_dummy.makefile b/conf/firmwares/subsystems/shared/actuators_dummy.makefile
index b91bfa8834..6e986da9da 100644
--- a/conf/firmwares/subsystems/shared/actuators_dummy.makefile
+++ b/conf/firmwares/subsystems/shared/actuators_dummy.makefile
@@ -1 +1 @@
-# for classix and AP only boards
+# for split AP/FBW
diff --git a/conf/flash_modes.xml b/conf/flash_modes.xml
index 826a198844..836398c17c 100644
--- a/conf/flash_modes.xml
+++ b/conf/flash_modes.xml
@@ -5,7 +5,6 @@
     <variable name="FLASH_MODE" value="ISP"/>
     <boards>
       <board name="booz_.*"/>
-      <board name="classix"/>
       <board name="hb_.*"/>
       <board name="logom_.*"/>
       <board name="navgo_.*"/>
@@ -30,7 +29,6 @@
     <variable name="FLASH_MODE" value="IAP"/>
     <boards>
       <board name="booz_.*"/>
-      <board name="classix"/>
       <board name="hb_.*"/>
       <board name="logom_.*"/>
       <board name="navgo_.*"/>
diff --git a/sw/airborne/boards/classix_1.0.h b/sw/airborne/boards/classix_1.0.h
deleted file mode 100644
index 2e32cb1a22..0000000000
--- a/sw/airborne/boards/classix_1.0.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef CONFIG_CLASSIX_H
-#define CONFIG_CLASSIX_H
-
-/* Master oscillator freq.       */
-#define FOSC (12000000)
-/* PLL multiplier                */
-#define PLL_MUL (5)
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL)
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x00
-#define PBSD_VAL 4
-/* Peripheral bus clock freq.    */
-#define PCLK (CCLK / PBSD_VAL)
-
-
-
-#ifdef FBW
-#ifndef USE_LED_1
-#define USE_LED_1 1
-#endif
-#define LED_1_BANK 1
-#define LED_1_PIN 24
-
-#ifndef USE_LED_2
-#define USE_LED_2 1
-#endif
-#define LED_2_BANK 1
-#define LED_2_PIN 31
-
-
-/* PPM : rc rx on P0.16 : FBW_RC1 connector
-#define PPM_PINSEL PINSEL1
-#define PPM_PINSEL_VAL 0x03
-#define PPM_PINSEL_BIT 0
-*/
-
-
-/* PPM : rc rx on P0.6 : FBW_RC0 connector */
-#define PPM_PINSEL PINSEL0
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 12
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-/* Default actuators driver */
-#define DEFAULT_ACTUATORS "subsystems/actuators/actuators_pwm.h"
-#define ActuatorDefaultSet(_x,_y) ActuatorPwmSet(_x,_y)
-#define ActuatorsDefaultInit() ActuatorsPwmInit()
-#define ActuatorsDefaultCommit() ActuatorsPwmCommit()
-
-/* SERVOS : 4017 on FBW_RC0 connector (ppm driver) */
-
-/* MAT0.1 on P0.5 */
-#define SERVO_CLOCK_PIN 5
-#define SERVO_CLOCK_PINSEL PINSEL0
-#define SERVO_CLOCK_PINSEL_VAL 0x02
-#define SERVO_CLOCK_PINSEL_BIT 10
-
-/* reset on P1.25 */
-#define SERVO_RESET_PIN 25
-#define SERVO_RESET_PINSEL PINSEL2
-
-/* ADCs */
-/* AD0.6 ( on pin P0.4 ) is supply monitoring */
-#define USE_AD0_6
-
-#endif /* FBW */
-
-
-
-#ifdef AP
-
-#define SPI_SELECT_SLAVE0_PORT 0
-#define SPI_SELECT_SLAVE0_PIN 20
-#define SPI_SELECT_SLAVE0_PINSEL PINSEL1
-#define SPI_SELECT_SLAVE0_PINSEL_BIT 8
-#define SPI_SELECT_SLAVE0_PINSEL_VAL 0
-
-#ifndef SITL
-/* sitl handles this board as a mono-processor one: unfortunately these
-   definitions are already in FBW */
-
-#ifndef USE_LED_1
-#define USE_LED_1 1
-#endif
-#define LED_1_BANK 1
-#define LED_1_PIN 18
-
-#ifndef USE_LED_2
-#define USE_LED_2 1
-#endif
-#define LED_2_BANK 1
-#define LED_2_PIN 19
-
-#ifndef USE_LED_3
-#define USE_LED_3 1
-#endif
-#define LED_3_BANK 1
-#define LED_3_PIN 20
-
-#endif /* !SITL */
-
-#endif /* AP */
-
-/* ADC */
-/* Definitions for test_adcs.c, to test ADCs on AP ANALOG1 */
-#define ADC_0 AdcBank1(5)
-#define ADC_1 AdcBank1(6)
-#define ADC_2 AdcBank1(7)
-#define ADC_3 AdcBank1(4)
-#define ADC_4 AdcBank1(3)
-#define ADC_5 AdcBank1(2)
-
-
-#endif /* CONFIG_CLASSIX_H */