diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
index 906be71ee7b0d888f894247580070d4bf47ce5bd..1c90064d80b68d4ed5de33eba714fe236adb82b8 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
@@ -65,18 +65,6 @@ bool APMAirframeComponent::setupComplete(void) const
 #endif
 }
 
-QString APMAirframeComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
 {
     // You'll need to figure out which parameters trigger setup complete
@@ -87,19 +75,6 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
 #endif
 }
 
-QStringList APMAirframeComponent::paramFilterList(void) const
-{
-#if 0
-    QStringList list;
-    
-    list << "SYS_AUTOSTART";
-    
-    return list;
-#else
-    return QStringList();
-#endif
-}
-
 QUrl APMAirframeComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMAirframeComponent.qml");
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.h b/src/AutoPilotPlugins/APM/APMAirframeComponent.h
index 4231af7cc0c7478c813bc9f187a6282540539af2..a37f9d3f98e62b2207b3846116cc541735233b3c 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponent.h
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.h
@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;    
     virtual QString prerequisiteSetup(void) const;
 
diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
index afa0b4bf78d1151352e6b8cf1b5ca7e2ebf3d6d7..77456548006c472c8bd2b01852c89527d346b81c 100644
--- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.cc
@@ -55,28 +55,11 @@ bool APMFlightModesComponent::setupComplete(void) const
     return true;
 }
 
-QString APMFlightModesComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMFlightModesComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList APMFlightModesComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMFlightModesComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMFlightModesComponent.qml");
diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h
index 3a82fadef206f285d4a866e74ea6f8bdfdf8e9dd..349e08d3d8f8ca0df2acc7eeba4968790f75e1b7 100644
--- a/src/AutoPilotPlugins/APM/APMFlightModesComponent.h
+++ b/src/AutoPilotPlugins/APM/APMFlightModesComponent.h
@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.cc b/src/AutoPilotPlugins/APM/APMRadioComponent.cc
index 0c2e8b9b7169aabefe708cda85b8667d673d6e5d..c42a1d553b99be47d23e2660385e50ce96caf89a 100644
--- a/src/AutoPilotPlugins/APM/APMRadioComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMRadioComponent.cc
@@ -67,18 +67,6 @@ bool APMRadioComponent::setupComplete(void) const
     return true;
 }
 
-QString APMRadioComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -88,15 +76,6 @@ QStringList APMRadioComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList APMRadioComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "RC*";
-    
-    return list;
-}
-
 QUrl APMRadioComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/RadioComponent.qml");
diff --git a/src/AutoPilotPlugins/APM/APMRadioComponent.h b/src/AutoPilotPlugins/APM/APMRadioComponent.h
index 44df877c48d22e8225d995e3fb73358cc40e8ae6..0a179430d8d4af92960d247a5ddb6d55be091160 100644
--- a/src/AutoPilotPlugins/APM/APMRadioComponent.h
+++ b/src/AutoPilotPlugins/APM/APMRadioComponent.h
@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.cc b/src/AutoPilotPlugins/APM/APMSafetyComponent.cc
index 4d18ab7610db73b729282901cfcf98feae4384ac..1346fa6e138172913a12da3d9a8ec09e8b29079a 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.cc
@@ -60,28 +60,11 @@ bool APMSafetyComponent::setupComplete(void) const
     return true;
 }
 
-QString APMSafetyComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMSafetyComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList APMSafetyComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMSafetyComponent::setupSource(void) const
 {
     QString qmlFile;
diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.h b/src/AutoPilotPlugins/APM/APMSafetyComponent.h
index bb8ed68d8b42c0b0e6419ba53b90fc741a6eea5b..ad6dfa89817f8d08b6444ab9412f838105295059 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponent.h
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.h
@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.cc b/src/AutoPilotPlugins/APM/APMSensorsComponent.cc
index 7df8c28697882415856eee67935e01d63f549c6b..49f4b599fe3db6326037e8feb4649943937355e8 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.cc
@@ -60,18 +60,6 @@ bool APMSensorsComponent::setupComplete(void) const
     return !compassSetupNeeded() && !accelSetupNeeded();
 }
 
-QString APMSensorsComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -91,11 +79,6 @@ QStringList APMSensorsComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList APMSensorsComponent::paramFilterList(void) const
-{
-    return QStringList();
-}
-
 QUrl APMSensorsComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/APMSensorsComponent.qml");
diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponent.h b/src/AutoPilotPlugins/APM/APMSensorsComponent.h
index c22e9492f1d4c40ee46b6a9747e80691285c4b11..fec2fa0dbae53db7d00982c491d4366df4d5451b 100644
--- a/src/AutoPilotPlugins/APM/APMSensorsComponent.h
+++ b/src/AutoPilotPlugins/APM/APMSensorsComponent.h
@@ -45,9 +45,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.cc b/src/AutoPilotPlugins/PX4/AirframeComponent.cc
index 26ad001370ad0cd90a004bf78f8f831f3d29a695..24f6dcdb2d0faf978a9cd8e341ac11aed221292b 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponent.cc
+++ b/src/AutoPilotPlugins/PX4/AirframeComponent.cc
@@ -145,32 +145,11 @@ bool AirframeComponent::setupComplete(void) const
     return _autopilot->getParameterFact(FactSystem::defaultComponentId, "SYS_AUTOSTART")->rawValue().toInt() != 0;
 }
 
-QString AirframeComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList AirframeComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList("SYS_AUTOSTART");
 }
 
-QStringList AirframeComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "SYS_AUTOSTART";
-    
-    return list;
-}
-
 QUrl AirframeComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/AirframeComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/AirframeComponent.h b/src/AutoPilotPlugins/PX4/AirframeComponent.h
index b43d5907bec7303fd7952294d78a720fcaa4590d..a31e5b7b674271698558278282723cc654706ee1 100644
--- a/src/AutoPilotPlugins/PX4/AirframeComponent.h
+++ b/src/AutoPilotPlugins/PX4/AirframeComponent.h
@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;    
     virtual QString prerequisiteSetup(void) const;
 
diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
index a36a1e50ac8d094bac4d3f1dab828ca1907945d6..66ad52af876b03c25aec1a2ffd728cc407afdad2 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.cc
@@ -33,16 +33,6 @@ struct SwitchListItem {
     const char* name;
 };
 
-/// @brief Used to translate from RC_MAP_* parameters name to user string
-static const SwitchListItem switchList[] = {
-    { "RC_MAP_MODE_SW",     "Mode Switch:" },                // First entry must be mode switch
-    { "RC_MAP_POSCTL_SW",   "Position Control Switch:" },
-    { "RC_MAP_LOITER_SW",   "Loiter Switch:" },
-    { "RC_MAP_RETURN_SW",   "Return Switch:" },
-    { "RC_MAP_ACRO_SW",     "Acro Switch:" },
-};
-static const size_t cSwitchList = sizeof(switchList) / sizeof(switchList[0]);
-
 FlightModesComponent::FlightModesComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent) :
     PX4Component(vehicle, autopilot, parent),
     _name(tr("Flight Modes"))
@@ -77,34 +67,11 @@ bool FlightModesComponent::setupComplete(void) const
             _autopilot->getParameterFact(FactSystem::defaultComponentId, "RC_MAP_MODE_SW")->rawValue().toInt() != 0;
 }
 
-QString FlightModesComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList FlightModesComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList("RC_MAP_MODE_SW");
 }
 
-QStringList FlightModesComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    for (size_t i=0; i<cSwitchList; i++) {
-        list << switchList[i].param;
-    }
-
-    return list;
-}
-
 QUrl FlightModesComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/FlightModesComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponent.h b/src/AutoPilotPlugins/PX4/FlightModesComponent.h
index e5a3adcf464bc8947b68fd3aaf6d1f075eb0bc2e..c8502fdd79cc8fccde953963ef9fae4f4554b5ff 100644
--- a/src/AutoPilotPlugins/PX4/FlightModesComponent.h
+++ b/src/AutoPilotPlugins/PX4/FlightModesComponent.h
@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponent.cc b/src/AutoPilotPlugins/PX4/PX4RadioComponent.cc
index 4e34322f07b5999d2007cb9900a9273794a75442..e5fb76f56e09bf259b97ccdfb96ff97d25455c6e 100644
--- a/src/AutoPilotPlugins/PX4/PX4RadioComponent.cc
+++ b/src/AutoPilotPlugins/PX4/PX4RadioComponent.cc
@@ -69,18 +69,6 @@ bool PX4RadioComponent::setupComplete(void) const
     return true;
 }
 
-QString PX4RadioComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList PX4RadioComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -90,15 +78,6 @@ QStringList PX4RadioComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList PX4RadioComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "RC*";
-    
-    return list;
-}
-
 QUrl PX4RadioComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/RadioComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponent.h b/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
index 3ffc86cc08cab2311a1841c22225995add30da39..e8d14787520bb518bdd44d8a17e0f37c258f4ff0 100644
--- a/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
+++ b/src/AutoPilotPlugins/PX4/PX4RadioComponent.h
@@ -42,9 +42,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.cc b/src/AutoPilotPlugins/PX4/PowerComponent.cc
index 5f2381225f794ec371880c8562d388469b40f03a..0b07f24669cfd4dc2e635483b2265a07c8ac464d 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.cc
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.cc
@@ -62,30 +62,11 @@ bool PowerComponent::setupComplete(void) const
         _autopilot->getParameterFact(FactSystem::defaultComponentId, "BAT_N_CELLS")->rawValue().toInt() != 0;
 }
 
-QString PowerComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList PowerComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList PowerComponent::paramFilterList(void) const
-{
-    QStringList list;
-
-    return list;
-}
-
 QUrl PowerComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/PowerComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/PowerComponent.h b/src/AutoPilotPlugins/PX4/PowerComponent.h
index 7d21055243095488cb511a621bd96c2d51809ba5..3bddfa3e6bc2801d7b2fc95283a00f3c138b455c 100644
--- a/src/AutoPilotPlugins/PX4/PowerComponent.h
+++ b/src/AutoPilotPlugins/PX4/PowerComponent.h
@@ -46,9 +46,7 @@ public:
     virtual QString     iconResource            (void) const;
     virtual bool        requiresSetup           (void) const;
     virtual bool        setupComplete           (void) const;
-    virtual QString     setupStateDescription   (void) const;
     virtual QUrl        setupSource             (void) const;
-    virtual QStringList paramFilterList         (void) const;
     virtual QUrl        summaryQmlSource        (void) const;
     virtual QString     prerequisiteSetup       (void) const;
     
diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.cc b/src/AutoPilotPlugins/PX4/SafetyComponent.cc
index 27dfb9fd8060f9436189c929e97d893836825906..52330744d11bf5aadc19ed23d7eb28e4104de720 100644
--- a/src/AutoPilotPlugins/PX4/SafetyComponent.cc
+++ b/src/AutoPilotPlugins/PX4/SafetyComponent.cc
@@ -60,30 +60,11 @@ bool SafetyComponent::setupComplete(void) const
     return true;
 }
 
-QString SafetyComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-
-    if (requiresSetup()) {
-        stateDescription = "Requires setup";
-    } else {
-        stateDescription = "Setup complete";
-    }
-    return QString(stateDescription);
-}
-
 QStringList SafetyComponent::setupCompleteChangedTriggerList(void) const
 {
     return QStringList();
 }
 
-QStringList SafetyComponent::paramFilterList(void) const
-{
-    QStringList list;
-
-    return list;
-}
-
 QUrl SafetyComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/SafetyComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.h b/src/AutoPilotPlugins/PX4/SafetyComponent.h
index 7b11f59b888432ecc546a65e224d997f9f6a6106..b6f9c18570cf7e9ec1e983969e29dc63d7ad9bc3 100644
--- a/src/AutoPilotPlugins/PX4/SafetyComponent.h
+++ b/src/AutoPilotPlugins/PX4/SafetyComponent.h
@@ -47,9 +47,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.cc b/src/AutoPilotPlugins/PX4/SensorsComponent.cc
index d810c6a943c7e51cc329fbd1358ebc2d3b3a9ec3..5f059eb63955f5d8f2152d7991c6fabb4f02e57d 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.cc
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.cc
@@ -70,18 +70,6 @@ bool SensorsComponent::setupComplete(void) const
     return true;
 }
 
-QString SensorsComponent::setupStateDescription(void) const
-{
-    const char* stateDescription;
-    
-    if (requiresSetup()) {
-        stateDescription = "Requires calibration";
-    } else {
-        stateDescription = "Calibrated";
-    }
-    return QString(stateDescription);
-}
-
 QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
 {
     QStringList triggers;
@@ -105,15 +93,6 @@ QStringList SensorsComponent::setupCompleteChangedTriggerList(void) const
     return triggers;
 }
 
-QStringList SensorsComponent::paramFilterList(void) const
-{
-    QStringList list;
-    
-    list << "SENS_*" << "CAL_*";
-    
-    return list;
-}
-
 QUrl SensorsComponent::setupSource(void) const
 {
     return QUrl::fromUserInput("qrc:/qml/SensorsComponent.qml");
diff --git a/src/AutoPilotPlugins/PX4/SensorsComponent.h b/src/AutoPilotPlugins/PX4/SensorsComponent.h
index aa79968d338871950a5eb1e57bf6ad62afd3cdd7..5e5349fcf3297f8f4f1de3bb2a4fa2b124fe7264 100644
--- a/src/AutoPilotPlugins/PX4/SensorsComponent.h
+++ b/src/AutoPilotPlugins/PX4/SensorsComponent.h
@@ -46,9 +46,7 @@ public:
     virtual QString iconResource(void) const;
     virtual bool requiresSetup(void) const;
     virtual bool setupComplete(void) const;
-    virtual QString setupStateDescription(void) const;
     virtual QUrl setupSource(void) const;
-    virtual QStringList paramFilterList(void) const;
     virtual QUrl summaryQmlSource(void) const;
     virtual QString prerequisiteSetup(void) const;
     
diff --git a/src/VehicleSetup/VehicleComponent.h b/src/VehicleSetup/VehicleComponent.h
index d777e7ae92ed88f4f8b86097fbfadf9d38e7613e..dcc3ea114ccaa802c22a00c83c54833bf696cc9f 100644
--- a/src/VehicleSetup/VehicleComponent.h
+++ b/src/VehicleSetup/VehicleComponent.h
@@ -46,7 +46,6 @@ class VehicleComponent : public QObject
     Q_PROPERTY(QString description READ description CONSTANT)
     Q_PROPERTY(bool requiresSetup READ requiresSetup CONSTANT)
     Q_PROPERTY(bool setupComplete READ setupComplete STORED false NOTIFY setupCompleteChanged)
-    Q_PROPERTY(QString setupStateDescription READ setupStateDescription STORED false)
     Q_PROPERTY(QString iconResource READ iconResource CONSTANT)
     Q_PROPERTY(QUrl setupSource READ setupSource CONSTANT)
     Q_PROPERTY(QUrl summaryQmlSource READ summaryQmlSource CONSTANT)
@@ -61,9 +60,7 @@ public:
     virtual QString iconResource(void) const = 0;
     virtual bool requiresSetup(void) const = 0;
     virtual bool setupComplete(void) const = 0;
-    virtual QString setupStateDescription(void) const = 0;
     virtual QUrl setupSource(void) const = 0;
-    virtual QStringList paramFilterList(void) const = 0;
     virtual QUrl summaryQmlSource(void) const = 0;
     virtual QString prerequisiteSetup(void) const = 0;