diff --git a/flight/OpenPilot/UAVObjects/actuatorsettings.c b/flight/OpenPilot/UAVObjects/actuatorsettings.c
index 1c61f18bc..e733f1871 100644
--- a/flight/OpenPilot/UAVObjects/actuatorsettings.c
+++ b/flight/OpenPilot/UAVObjects/actuatorsettings.c
@@ -94,30 +94,6 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
 	data.VTOLMotorSW = 8;
 	data.VTOLMotorW = 8;
 	data.VTOLMotorNW = 8;
-	data.CCPMYawStabilizationInManualMode = 0;
-	data.CCPMFlybarless = 0;
-	data.CCPMThrottleCurve[0] = 0;
-	data.CCPMThrottleCurve[1] = 0;
-	data.CCPMThrottleCurve[2] = 0;
-	data.CCPMThrottleCurve[3] = 0;
-	data.CCPMThrottleCurve[4] = 0;
-	data.CCPMPitchCurve[0] = 0;
-	data.CCPMPitchCurve[1] = 0;
-	data.CCPMPitchCurve[2] = 0;
-	data.CCPMPitchCurve[3] = 0;
-	data.CCPMPitchCurve[4] = 0;
-	data.CCPMCollectiveConstant = 0.5;
-	data.CCPMCorrectionAngle = 0;
-	data.CCPMAngleW = 0;
-	data.CCPMAngleX = 60;
-	data.CCPMAngleY = 180;
-	data.CCPMAngleZ = 300;
-	data.CCPMServoW = 8;
-	data.CCPMServoX = 8;
-	data.CCPMServoY = 8;
-	data.CCPMServoZ = 8;
-	data.CCPMThrottle = 8;
-	data.CCPMTailRotor = 8;
 	data.ChannelUpdateFreq[0] = 50;
 	data.ChannelUpdateFreq[1] = 50;
 	data.ChannelMax[0] = 1000;
diff --git a/flight/OpenPilot/UAVObjects/inc/actuatorsettings.h b/flight/OpenPilot/UAVObjects/inc/actuatorsettings.h
index f643b4f7c..42f94c03c 100644
--- a/flight/OpenPilot/UAVObjects/inc/actuatorsettings.h
+++ b/flight/OpenPilot/UAVObjects/inc/actuatorsettings.h
@@ -41,7 +41,7 @@
 #define ACTUATORSETTINGS_H
 
 // Object constants
-#define ACTUATORSETTINGS_OBJID 3352303420U
+#define ACTUATORSETTINGS_OBJID 3054509114U
 #define ACTUATORSETTINGS_NAME "ActuatorSettings"
 #define ACTUATORSETTINGS_METANAME "ActuatorSettingsMeta"
 #define ACTUATORSETTINGS_ISSINGLEINST 1
@@ -85,22 +85,6 @@ typedef struct {
     uint8_t VTOLMotorSW;
     uint8_t VTOLMotorW;
     uint8_t VTOLMotorNW;
-    uint8_t CCPMYawStabilizationInManualMode;
-    uint8_t CCPMFlybarless;
-    float CCPMThrottleCurve[5];
-    float CCPMPitchCurve[5];
-    float CCPMCollectiveConstant;
-    float CCPMCorrectionAngle;
-    float CCPMAngleW;
-    float CCPMAngleX;
-    float CCPMAngleY;
-    float CCPMAngleZ;
-    uint8_t CCPMServoW;
-    uint8_t CCPMServoX;
-    uint8_t CCPMServoY;
-    uint8_t CCPMServoZ;
-    uint8_t CCPMThrottle;
-    uint8_t CCPMTailRotor;
     int16_t ChannelUpdateFreq[2];
     int16_t ChannelMax[8];
     int16_t ChannelNeutral[8];
@@ -151,42 +135,6 @@ typedef enum { ACTUATORSETTINGS_VTOLMOTORW_CHANNEL0=0, ACTUATORSETTINGS_VTOLMOTO
 // Field VTOLMotorNW information
 /* Enumeration options for field VTOLMotorNW */
 typedef enum { ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL0=0, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL1=1, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL2=2, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL3=3, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL4=4, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL5=5, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL6=6, ACTUATORSETTINGS_VTOLMOTORNW_CHANNEL7=7, ACTUATORSETTINGS_VTOLMOTORNW_NONE=8 } ActuatorSettingsVTOLMotorNWOptions;
-// Field CCPMYawStabilizationInManualMode information
-/* Enumeration options for field CCPMYawStabilizationInManualMode */
-typedef enum { ACTUATORSETTINGS_CCPMYAWSTABILIZATIONINMANUALMODE_FALSE=0, ACTUATORSETTINGS_CCPMYAWSTABILIZATIONINMANUALMODE_TRUE=1 } ActuatorSettingsCCPMYawStabilizationInManualModeOptions;
-// Field CCPMFlybarless information
-/* Enumeration options for field CCPMFlybarless */
-typedef enum { ACTUATORSETTINGS_CCPMFLYBARLESS_FALSE=0, ACTUATORSETTINGS_CCPMFLYBARLESS_TRUE=1 } ActuatorSettingsCCPMFlybarlessOptions;
-// Field CCPMThrottleCurve information
-/* Number of elements for field CCPMThrottleCurve */
-#define ACTUATORSETTINGS_CCPMTHROTTLECURVE_NUMELEM 5
-// Field CCPMPitchCurve information
-/* Number of elements for field CCPMPitchCurve */
-#define ACTUATORSETTINGS_CCPMPITCHCURVE_NUMELEM 5
-// Field CCPMCollectiveConstant information
-// Field CCPMCorrectionAngle information
-// Field CCPMAngleW information
-// Field CCPMAngleX information
-// Field CCPMAngleY information
-// Field CCPMAngleZ information
-// Field CCPMServoW information
-/* Enumeration options for field CCPMServoW */
-typedef enum { ACTUATORSETTINGS_CCPMSERVOW_CHANNEL0=0, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL1=1, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL2=2, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL3=3, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL4=4, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL5=5, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL6=6, ACTUATORSETTINGS_CCPMSERVOW_CHANNEL7=7, ACTUATORSETTINGS_CCPMSERVOW_NONE=8 } ActuatorSettingsCCPMServoWOptions;
-// Field CCPMServoX information
-/* Enumeration options for field CCPMServoX */
-typedef enum { ACTUATORSETTINGS_CCPMSERVOX_CHANNEL0=0, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL1=1, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL2=2, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL3=3, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL4=4, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL5=5, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL6=6, ACTUATORSETTINGS_CCPMSERVOX_CHANNEL7=7, ACTUATORSETTINGS_CCPMSERVOX_NONE=8 } ActuatorSettingsCCPMServoXOptions;
-// Field CCPMServoY information
-/* Enumeration options for field CCPMServoY */
-typedef enum { ACTUATORSETTINGS_CCPMSERVOY_CHANNEL0=0, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL1=1, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL2=2, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL3=3, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL4=4, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL5=5, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL6=6, ACTUATORSETTINGS_CCPMSERVOY_CHANNEL7=7, ACTUATORSETTINGS_CCPMSERVOY_NONE=8 } ActuatorSettingsCCPMServoYOptions;
-// Field CCPMServoZ information
-/* Enumeration options for field CCPMServoZ */
-typedef enum { ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL0=0, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL1=1, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL2=2, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL3=3, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL4=4, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL5=5, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL6=6, ACTUATORSETTINGS_CCPMSERVOZ_CHANNEL7=7, ACTUATORSETTINGS_CCPMSERVOZ_NONE=8 } ActuatorSettingsCCPMServoZOptions;
-// Field CCPMThrottle information
-/* Enumeration options for field CCPMThrottle */
-typedef enum { ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL0=0, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL1=1, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL2=2, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL3=3, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL4=4, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL5=5, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL6=6, ACTUATORSETTINGS_CCPMTHROTTLE_CHANNEL7=7, ACTUATORSETTINGS_CCPMTHROTTLE_NONE=8 } ActuatorSettingsCCPMThrottleOptions;
-// Field CCPMTailRotor information
-/* Enumeration options for field CCPMTailRotor */
-typedef enum { ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL0=0, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL1=1, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL2=2, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL3=3, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL4=4, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL5=5, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL6=6, ACTUATORSETTINGS_CCPMTAILROTOR_CHANNEL7=7, ACTUATORSETTINGS_CCPMTAILROTOR_NONE=8 } ActuatorSettingsCCPMTailRotorOptions;
 // Field ChannelUpdateFreq information
 /* Number of elements for field ChannelUpdateFreq */
 #define ACTUATORSETTINGS_CHANNELUPDATEFREQ_NUMELEM 2
diff --git a/ground/src/plugins/uavobjects/actuatorsettings.cpp b/ground/src/plugins/uavobjects/actuatorsettings.cpp
index 09b7e9fe1..b595bb631 100644
--- a/ground/src/plugins/uavobjects/actuatorsettings.cpp
+++ b/ground/src/plugins/uavobjects/actuatorsettings.cpp
@@ -224,128 +224,6 @@ ActuatorSettings::ActuatorSettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTI
     VTOLMotorNWEnumOptions.append("Channel7");
     VTOLMotorNWEnumOptions.append("None");
     fields.append( new UAVObjectField(QString("VTOLMotorNW"), QString("channel"), UAVObjectField::ENUM, VTOLMotorNWElemNames, VTOLMotorNWEnumOptions) );
-    QStringList CCPMYawStabilizationInManualModeElemNames;
-    CCPMYawStabilizationInManualModeElemNames.append("0");
-    QStringList CCPMYawStabilizationInManualModeEnumOptions;
-    CCPMYawStabilizationInManualModeEnumOptions.append("False");
-    CCPMYawStabilizationInManualModeEnumOptions.append("True");
-    fields.append( new UAVObjectField(QString("CCPMYawStabilizationInManualMode"), QString(""), UAVObjectField::ENUM, CCPMYawStabilizationInManualModeElemNames, CCPMYawStabilizationInManualModeEnumOptions) );
-    QStringList CCPMFlybarlessElemNames;
-    CCPMFlybarlessElemNames.append("0");
-    QStringList CCPMFlybarlessEnumOptions;
-    CCPMFlybarlessEnumOptions.append("False");
-    CCPMFlybarlessEnumOptions.append("True");
-    fields.append( new UAVObjectField(QString("CCPMFlybarless"), QString(""), UAVObjectField::ENUM, CCPMFlybarlessElemNames, CCPMFlybarlessEnumOptions) );
-    QStringList CCPMThrottleCurveElemNames;
-    CCPMThrottleCurveElemNames.append("0");
-    CCPMThrottleCurveElemNames.append("1");
-    CCPMThrottleCurveElemNames.append("2");
-    CCPMThrottleCurveElemNames.append("3");
-    CCPMThrottleCurveElemNames.append("4");
-    fields.append( new UAVObjectField(QString("CCPMThrottleCurve"), QString("percent"), UAVObjectField::FLOAT32, CCPMThrottleCurveElemNames, QStringList()) );
-    QStringList CCPMPitchCurveElemNames;
-    CCPMPitchCurveElemNames.append("0");
-    CCPMPitchCurveElemNames.append("1");
-    CCPMPitchCurveElemNames.append("2");
-    CCPMPitchCurveElemNames.append("3");
-    CCPMPitchCurveElemNames.append("4");
-    fields.append( new UAVObjectField(QString("CCPMPitchCurve"), QString("percent"), UAVObjectField::FLOAT32, CCPMPitchCurveElemNames, QStringList()) );
-    QStringList CCPMCollectiveConstantElemNames;
-    CCPMCollectiveConstantElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMCollectiveConstant"), QString("multiplier (0.0 -> 1.0)"), UAVObjectField::FLOAT32, CCPMCollectiveConstantElemNames, QStringList()) );
-    QStringList CCPMCorrectionAngleElemNames;
-    CCPMCorrectionAngleElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMCorrectionAngle"), QString("degrees"), UAVObjectField::FLOAT32, CCPMCorrectionAngleElemNames, QStringList()) );
-    QStringList CCPMAngleWElemNames;
-    CCPMAngleWElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMAngleW"), QString("degrees"), UAVObjectField::FLOAT32, CCPMAngleWElemNames, QStringList()) );
-    QStringList CCPMAngleXElemNames;
-    CCPMAngleXElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMAngleX"), QString("degrees"), UAVObjectField::FLOAT32, CCPMAngleXElemNames, QStringList()) );
-    QStringList CCPMAngleYElemNames;
-    CCPMAngleYElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMAngleY"), QString("degrees"), UAVObjectField::FLOAT32, CCPMAngleYElemNames, QStringList()) );
-    QStringList CCPMAngleZElemNames;
-    CCPMAngleZElemNames.append("0");
-    fields.append( new UAVObjectField(QString("CCPMAngleZ"), QString("degrees"), UAVObjectField::FLOAT32, CCPMAngleZElemNames, QStringList()) );
-    QStringList CCPMServoWElemNames;
-    CCPMServoWElemNames.append("0");
-    QStringList CCPMServoWEnumOptions;
-    CCPMServoWEnumOptions.append("Channel0");
-    CCPMServoWEnumOptions.append("Channel1");
-    CCPMServoWEnumOptions.append("Channel2");
-    CCPMServoWEnumOptions.append("Channel3");
-    CCPMServoWEnumOptions.append("Channel4");
-    CCPMServoWEnumOptions.append("Channel5");
-    CCPMServoWEnumOptions.append("Channel6");
-    CCPMServoWEnumOptions.append("Channel7");
-    CCPMServoWEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMServoW"), QString("channel"), UAVObjectField::ENUM, CCPMServoWElemNames, CCPMServoWEnumOptions) );
-    QStringList CCPMServoXElemNames;
-    CCPMServoXElemNames.append("0");
-    QStringList CCPMServoXEnumOptions;
-    CCPMServoXEnumOptions.append("Channel0");
-    CCPMServoXEnumOptions.append("Channel1");
-    CCPMServoXEnumOptions.append("Channel2");
-    CCPMServoXEnumOptions.append("Channel3");
-    CCPMServoXEnumOptions.append("Channel4");
-    CCPMServoXEnumOptions.append("Channel5");
-    CCPMServoXEnumOptions.append("Channel6");
-    CCPMServoXEnumOptions.append("Channel7");
-    CCPMServoXEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMServoX"), QString("channel"), UAVObjectField::ENUM, CCPMServoXElemNames, CCPMServoXEnumOptions) );
-    QStringList CCPMServoYElemNames;
-    CCPMServoYElemNames.append("0");
-    QStringList CCPMServoYEnumOptions;
-    CCPMServoYEnumOptions.append("Channel0");
-    CCPMServoYEnumOptions.append("Channel1");
-    CCPMServoYEnumOptions.append("Channel2");
-    CCPMServoYEnumOptions.append("Channel3");
-    CCPMServoYEnumOptions.append("Channel4");
-    CCPMServoYEnumOptions.append("Channel5");
-    CCPMServoYEnumOptions.append("Channel6");
-    CCPMServoYEnumOptions.append("Channel7");
-    CCPMServoYEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMServoY"), QString("channel"), UAVObjectField::ENUM, CCPMServoYElemNames, CCPMServoYEnumOptions) );
-    QStringList CCPMServoZElemNames;
-    CCPMServoZElemNames.append("0");
-    QStringList CCPMServoZEnumOptions;
-    CCPMServoZEnumOptions.append("Channel0");
-    CCPMServoZEnumOptions.append("Channel1");
-    CCPMServoZEnumOptions.append("Channel2");
-    CCPMServoZEnumOptions.append("Channel3");
-    CCPMServoZEnumOptions.append("Channel4");
-    CCPMServoZEnumOptions.append("Channel5");
-    CCPMServoZEnumOptions.append("Channel6");
-    CCPMServoZEnumOptions.append("Channel7");
-    CCPMServoZEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMServoZ"), QString("channel"), UAVObjectField::ENUM, CCPMServoZElemNames, CCPMServoZEnumOptions) );
-    QStringList CCPMThrottleElemNames;
-    CCPMThrottleElemNames.append("0");
-    QStringList CCPMThrottleEnumOptions;
-    CCPMThrottleEnumOptions.append("Channel0");
-    CCPMThrottleEnumOptions.append("Channel1");
-    CCPMThrottleEnumOptions.append("Channel2");
-    CCPMThrottleEnumOptions.append("Channel3");
-    CCPMThrottleEnumOptions.append("Channel4");
-    CCPMThrottleEnumOptions.append("Channel5");
-    CCPMThrottleEnumOptions.append("Channel6");
-    CCPMThrottleEnumOptions.append("Channel7");
-    CCPMThrottleEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMThrottle"), QString("channel"), UAVObjectField::ENUM, CCPMThrottleElemNames, CCPMThrottleEnumOptions) );
-    QStringList CCPMTailRotorElemNames;
-    CCPMTailRotorElemNames.append("0");
-    QStringList CCPMTailRotorEnumOptions;
-    CCPMTailRotorEnumOptions.append("Channel0");
-    CCPMTailRotorEnumOptions.append("Channel1");
-    CCPMTailRotorEnumOptions.append("Channel2");
-    CCPMTailRotorEnumOptions.append("Channel3");
-    CCPMTailRotorEnumOptions.append("Channel4");
-    CCPMTailRotorEnumOptions.append("Channel5");
-    CCPMTailRotorEnumOptions.append("Channel6");
-    CCPMTailRotorEnumOptions.append("Channel7");
-    CCPMTailRotorEnumOptions.append("None");
-    fields.append( new UAVObjectField(QString("CCPMTailRotor"), QString("channel"), UAVObjectField::ENUM, CCPMTailRotorElemNames, CCPMTailRotorEnumOptions) );
     QStringList ChannelUpdateFreqElemNames;
     ChannelUpdateFreqElemNames.append("0");
     ChannelUpdateFreqElemNames.append("1");
@@ -427,30 +305,6 @@ void ActuatorSettings::setDefaultFieldValues()
     data.VTOLMotorSW = 8;
     data.VTOLMotorW = 8;
     data.VTOLMotorNW = 8;
-    data.CCPMYawStabilizationInManualMode = 0;
-    data.CCPMFlybarless = 0;
-    data.CCPMThrottleCurve[0] = 0;
-    data.CCPMThrottleCurve[1] = 0;
-    data.CCPMThrottleCurve[2] = 0;
-    data.CCPMThrottleCurve[3] = 0;
-    data.CCPMThrottleCurve[4] = 0;
-    data.CCPMPitchCurve[0] = 0;
-    data.CCPMPitchCurve[1] = 0;
-    data.CCPMPitchCurve[2] = 0;
-    data.CCPMPitchCurve[3] = 0;
-    data.CCPMPitchCurve[4] = 0;
-    data.CCPMCollectiveConstant = 0.5;
-    data.CCPMCorrectionAngle = 0;
-    data.CCPMAngleW = 0;
-    data.CCPMAngleX = 60;
-    data.CCPMAngleY = 180;
-    data.CCPMAngleZ = 300;
-    data.CCPMServoW = 8;
-    data.CCPMServoX = 8;
-    data.CCPMServoY = 8;
-    data.CCPMServoZ = 8;
-    data.CCPMThrottle = 8;
-    data.CCPMTailRotor = 8;
     data.ChannelUpdateFreq[0] = 50;
     data.ChannelUpdateFreq[1] = 50;
     data.ChannelMax[0] = 1000;
diff --git a/ground/src/plugins/uavobjects/actuatorsettings.h b/ground/src/plugins/uavobjects/actuatorsettings.h
index 83d38298a..d307d27ab 100644
--- a/ground/src/plugins/uavobjects/actuatorsettings.h
+++ b/ground/src/plugins/uavobjects/actuatorsettings.h
@@ -57,22 +57,6 @@ public:
         quint8 VTOLMotorSW;
         quint8 VTOLMotorW;
         quint8 VTOLMotorNW;
-        quint8 CCPMYawStabilizationInManualMode;
-        quint8 CCPMFlybarless;
-        float CCPMThrottleCurve[5];
-        float CCPMPitchCurve[5];
-        float CCPMCollectiveConstant;
-        float CCPMCorrectionAngle;
-        float CCPMAngleW;
-        float CCPMAngleX;
-        float CCPMAngleY;
-        float CCPMAngleZ;
-        quint8 CCPMServoW;
-        quint8 CCPMServoX;
-        quint8 CCPMServoY;
-        quint8 CCPMServoZ;
-        quint8 CCPMThrottle;
-        quint8 CCPMTailRotor;
         qint16 ChannelUpdateFreq[2];
         qint16 ChannelMax[8];
         qint16 ChannelNeutral[8];
@@ -123,42 +107,6 @@ public:
     // Field VTOLMotorNW information
     /* Enumeration options for field VTOLMotorNW */
     typedef enum { VTOLMOTORNW_CHANNEL0=0, VTOLMOTORNW_CHANNEL1=1, VTOLMOTORNW_CHANNEL2=2, VTOLMOTORNW_CHANNEL3=3, VTOLMOTORNW_CHANNEL4=4, VTOLMOTORNW_CHANNEL5=5, VTOLMOTORNW_CHANNEL6=6, VTOLMOTORNW_CHANNEL7=7, VTOLMOTORNW_NONE=8 } VTOLMotorNWOptions;
-    // Field CCPMYawStabilizationInManualMode information
-    /* Enumeration options for field CCPMYawStabilizationInManualMode */
-    typedef enum { CCPMYAWSTABILIZATIONINMANUALMODE_FALSE=0, CCPMYAWSTABILIZATIONINMANUALMODE_TRUE=1 } CCPMYawStabilizationInManualModeOptions;
-    // Field CCPMFlybarless information
-    /* Enumeration options for field CCPMFlybarless */
-    typedef enum { CCPMFLYBARLESS_FALSE=0, CCPMFLYBARLESS_TRUE=1 } CCPMFlybarlessOptions;
-    // Field CCPMThrottleCurve information
-    /* Number of elements for field CCPMThrottleCurve */
-    static const quint32 CCPMTHROTTLECURVE_NUMELEM = 5;
-    // Field CCPMPitchCurve information
-    /* Number of elements for field CCPMPitchCurve */
-    static const quint32 CCPMPITCHCURVE_NUMELEM = 5;
-    // Field CCPMCollectiveConstant information
-    // Field CCPMCorrectionAngle information
-    // Field CCPMAngleW information
-    // Field CCPMAngleX information
-    // Field CCPMAngleY information
-    // Field CCPMAngleZ information
-    // Field CCPMServoW information
-    /* Enumeration options for field CCPMServoW */
-    typedef enum { CCPMSERVOW_CHANNEL0=0, CCPMSERVOW_CHANNEL1=1, CCPMSERVOW_CHANNEL2=2, CCPMSERVOW_CHANNEL3=3, CCPMSERVOW_CHANNEL4=4, CCPMSERVOW_CHANNEL5=5, CCPMSERVOW_CHANNEL6=6, CCPMSERVOW_CHANNEL7=7, CCPMSERVOW_NONE=8 } CCPMServoWOptions;
-    // Field CCPMServoX information
-    /* Enumeration options for field CCPMServoX */
-    typedef enum { CCPMSERVOX_CHANNEL0=0, CCPMSERVOX_CHANNEL1=1, CCPMSERVOX_CHANNEL2=2, CCPMSERVOX_CHANNEL3=3, CCPMSERVOX_CHANNEL4=4, CCPMSERVOX_CHANNEL5=5, CCPMSERVOX_CHANNEL6=6, CCPMSERVOX_CHANNEL7=7, CCPMSERVOX_NONE=8 } CCPMServoXOptions;
-    // Field CCPMServoY information
-    /* Enumeration options for field CCPMServoY */
-    typedef enum { CCPMSERVOY_CHANNEL0=0, CCPMSERVOY_CHANNEL1=1, CCPMSERVOY_CHANNEL2=2, CCPMSERVOY_CHANNEL3=3, CCPMSERVOY_CHANNEL4=4, CCPMSERVOY_CHANNEL5=5, CCPMSERVOY_CHANNEL6=6, CCPMSERVOY_CHANNEL7=7, CCPMSERVOY_NONE=8 } CCPMServoYOptions;
-    // Field CCPMServoZ information
-    /* Enumeration options for field CCPMServoZ */
-    typedef enum { CCPMSERVOZ_CHANNEL0=0, CCPMSERVOZ_CHANNEL1=1, CCPMSERVOZ_CHANNEL2=2, CCPMSERVOZ_CHANNEL3=3, CCPMSERVOZ_CHANNEL4=4, CCPMSERVOZ_CHANNEL5=5, CCPMSERVOZ_CHANNEL6=6, CCPMSERVOZ_CHANNEL7=7, CCPMSERVOZ_NONE=8 } CCPMServoZOptions;
-    // Field CCPMThrottle information
-    /* Enumeration options for field CCPMThrottle */
-    typedef enum { CCPMTHROTTLE_CHANNEL0=0, CCPMTHROTTLE_CHANNEL1=1, CCPMTHROTTLE_CHANNEL2=2, CCPMTHROTTLE_CHANNEL3=3, CCPMTHROTTLE_CHANNEL4=4, CCPMTHROTTLE_CHANNEL5=5, CCPMTHROTTLE_CHANNEL6=6, CCPMTHROTTLE_CHANNEL7=7, CCPMTHROTTLE_NONE=8 } CCPMThrottleOptions;
-    // Field CCPMTailRotor information
-    /* Enumeration options for field CCPMTailRotor */
-    typedef enum { CCPMTAILROTOR_CHANNEL0=0, CCPMTAILROTOR_CHANNEL1=1, CCPMTAILROTOR_CHANNEL2=2, CCPMTAILROTOR_CHANNEL3=3, CCPMTAILROTOR_CHANNEL4=4, CCPMTAILROTOR_CHANNEL5=5, CCPMTAILROTOR_CHANNEL6=6, CCPMTAILROTOR_CHANNEL7=7, CCPMTAILROTOR_NONE=8 } CCPMTailRotorOptions;
     // Field ChannelUpdateFreq information
     /* Number of elements for field ChannelUpdateFreq */
     static const quint32 CHANNELUPDATEFREQ_NUMELEM = 2;
@@ -174,7 +122,7 @@ public:
 
   
     // Constants
-    static const quint32 OBJID = 3352303420U;
+    static const quint32 OBJID = 3054509114U;
     static const QString NAME;
     static const bool ISSINGLEINST = 1;
     static const bool ISSETTINGS = 1;
diff --git a/ground/src/plugins/uavobjects/actuatorsettings.py b/ground/src/plugins/uavobjects/actuatorsettings.py
index b51b162f2..3ec6cb061 100644
--- a/ground/src/plugins/uavobjects/actuatorsettings.py
+++ b/ground/src/plugins/uavobjects/actuatorsettings.py
@@ -303,232 +303,6 @@ _fields = [ \
 			'8' : 'None',
 		}
 	),
-	uavobject.UAVObjectField(
-		'CCPMYawStabilizationInManualMode',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'False',
-			'1' : 'True',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMFlybarless',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'False',
-			'1' : 'True',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMThrottleCurve',
-		'f',
-		5,
-		[
-			'0',
-			'1',
-			'2',
-			'3',
-			'4',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMPitchCurve',
-		'f',
-		5,
-		[
-			'0',
-			'1',
-			'2',
-			'3',
-			'4',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMCollectiveConstant',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMCorrectionAngle',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMAngleW',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMAngleX',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMAngleY',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMAngleZ',
-		'f',
-		1,
-		[
-			'0',
-		],
-		{
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMServoW',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMServoX',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMServoY',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMServoZ',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMThrottle',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
-	uavobject.UAVObjectField(
-		'CCPMTailRotor',
-		'b',
-		1,
-		[
-			'0',
-		],
-		{
-			'0' : 'Channel0',
-			'1' : 'Channel1',
-			'2' : 'Channel2',
-			'3' : 'Channel3',
-			'4' : 'Channel4',
-			'5' : 'Channel5',
-			'6' : 'Channel6',
-			'7' : 'Channel7',
-			'8' : 'None',
-		}
-	),
 	uavobject.UAVObjectField(
 		'ChannelUpdateFreq',
 		'h',
@@ -596,7 +370,7 @@ _fields = [ \
 
 class ActuatorSettings(uavobject.UAVObject):
     ## Object constants
-    OBJID        = 3352303420
+    OBJID        = 3054509114
     NAME         = "ActuatorSettings"
     METANAME     = "ActuatorSettingsMeta"
     ISSINGLEINST = 1
diff --git a/ground/src/shared/uavobjectdefinition/actuatorsettings.xml b/ground/src/shared/uavobjectdefinition/actuatorsettings.xml
index e128546ee..f78908d2e 100644
--- a/ground/src/shared/uavobjectdefinition/actuatorsettings.xml
+++ b/ground/src/shared/uavobjectdefinition/actuatorsettings.xml
@@ -15,22 +15,6 @@
         <field name="VTOLMotorSW" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
         <field name="VTOLMotorW" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
         <field name="VTOLMotorNW" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMYawStabilizationInManualMode" units="" type="enum" elements="1" options="False,True" defaultvalue="False"/>
-        <field name="CCPMFlybarless" units="" type="enum" elements="1" options="False,True" defaultvalue="False"/>
-        <field name="CCPMThrottleCurve" units="percent" type="float" elements="5" defaultvalue="0.00"/>
-        <field name="CCPMPitchCurve" units="percent" type="float" elements="5" defaultvalue="0.00"/>
-        <field name="CCPMCollectiveConstant" units="multiplier (0.0 -> 1.0)" type="float" elements="1" defaultvalue="0.5"/>
-        <field name="CCPMCorrectionAngle" units="degrees" type="float" elements="1" defaultvalue="0"/>
-        <field name="CCPMAngleW" units="degrees" type="float" elements="1" defaultvalue="0"/>
-        <field name="CCPMAngleX" units="degrees" type="float" elements="1" defaultvalue="60"/>
-        <field name="CCPMAngleY" units="degrees" type="float" elements="1" defaultvalue="180"/>
-        <field name="CCPMAngleZ" units="degrees" type="float" elements="1" defaultvalue="300"/>
-        <field name="CCPMServoW" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMServoX" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMServoY" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMServoZ" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMThrottle" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
-        <field name="CCPMTailRotor" units="channel" type="enum" elements="1" options="Channel0,Channel1,Channel2,Channel3,Channel4,Channel5,Channel6,Channel7,None" defaultvalue="None"/>
         <field name="ChannelUpdateFreq" units="Hz" type="int16" elements="2" defaultvalue="50"/>
         <field name="ChannelMax" units="us" type="int16" elements="8" defaultvalue="1000"/>
         <field name="ChannelNeutral" units="us" type="int16" elements="8" defaultvalue="1000"/>