diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp
index ccc83c1ff..0db64ce40 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGCamera.cpp
@@ -97,7 +97,7 @@ public:
     void updateClearColor()
     {
         if (!camera.valid()) {
-            qDebug() << "OSGCamera::updateClearColor - invalid camera";
+            qWarning() << "OSGCamera::updateClearColor - invalid camera";
             return;
         }
         // qDebug() << "OSGCamera::updateClearColor" << clearColor;
@@ -107,11 +107,11 @@ public:
     void updateFieldOfView()
     {
         if (!camera.valid()) {
-            qDebug() << "OSGCamera::updateFieldOfView - invalid camera";
+            qWarning() << "OSGCamera::updateFieldOfView - invalid camera";
             return;
         }
 
-        qDebug() << "OSGCamera::updateFieldOfView" << fieldOfView;
+        // qDebug() << "OSGCamera::updateFieldOfView" << fieldOfView;
 
         double fovy, ar, zn, zf;
         camera->getProjectionMatrixAsPerspective(fovy, ar, zn, zf);
@@ -122,18 +122,18 @@ public:
     void updateAspectRatio()
     {
         if (!camera.valid()) {
-            qDebug() << "OSGCamera::updateAspectRatio - invalid camera";
+            qWarning() << "OSGCamera::updateAspectRatio - invalid camera";
             return;
         }
         osg::Viewport *viewport = camera->getViewport();
         if (!viewport) {
-            qDebug() << "OSGCamera::updateAspectRatio - no viewport" << viewport;
+            qWarning() << "OSGCamera::updateAspectRatio - no viewport" << viewport;
             return;
         }
 
         double aspectRatio = static_cast<double>(viewport->width()) / static_cast<double>(viewport->height());
 
-        qDebug() << "OSGCamera::updateAspectRatio" << aspectRatio;
+        // qDebug() << "OSGCamera::updateAspectRatio" << aspectRatio;
 
         double fovy, ar, zn, zf;
         camera->getProjectionMatrixAsPerspective(fovy, ar, zn, zf);
@@ -152,12 +152,12 @@ public:
 #ifdef USE_OSGEARTH
         // install log depth buffer if requested
         if (logDepthBufferEnabled && !logDepthBuffer) {
-            qDebug() << "OSGCamera::updateLogDepthBuffer - installing logarithmic depth buffer";
+            // qDebug() << "OSGCamera::updateLogDepthBuffer - installing logarithmic depth buffer";
             logDepthBuffer = new osgEarth::Util::LogarithmicDepthBuffer();
             logDepthBuffer->setUseFragDepth(true);
             logDepthBuffer->install(camera);
         } else if (!logDepthBufferEnabled && logDepthBuffer) {
-            qDebug() << "OSGCamera::updateLogDepthBuffer - uninstalling logarithmic depth buffer";
+            // qDebug() << "OSGCamera::updateLogDepthBuffer - uninstalling logarithmic depth buffer";
             logDepthBuffer->uninstall(camera);
             delete logDepthBuffer;
             logDepthBuffer = NULL;
@@ -168,11 +168,11 @@ public:
     void setGraphicsContext(osg::GraphicsContext *gc)
     {
         if (!camera.valid()) {
-            qDebug() << "OSGCamera::setGraphicsContext - invalid camera";
+            qWarning() << "OSGCamera::setGraphicsContext - invalid camera";
             return;
         }
 
-        qDebug() << "OSGCamera::setGraphicsContext" << gc;
+        // qDebug() << "OSGCamera::setGraphicsContext" << gc;
 
         camera->setGraphicsContext(gc);
         camera->setViewport(0, 0, gc->getTraits()->width, gc->getTraits()->height);
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp
index 196f9fe0b..136954697 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGFileNode.cpp
@@ -90,7 +90,7 @@ public:
 
     void updateSource()
     {
-        qDebug() << "OSGFileNode::updateNode" << source;
+        // qDebug() << "OSGFileNode::updateNode" << source;
         if (!source.isValid()) {
             self->setNode(NULL);
             if (!source.isEmpty()) {
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp
index 6793a2807..2575fdfe3 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGeoTransformNode.cpp
@@ -72,7 +72,7 @@ public:
 
     bool acceptSceneNode(OSGNode *node)
     {
-        qDebug() << "OSGGeoTransformNode::acceptSceneNode" << node;
+        // qDebug() << "OSGGeoTransformNode::acceptSceneNode" << node;
         if (sceneNode == node) {
             return false;
         }
@@ -92,7 +92,7 @@ public:
 
     void updateSceneNode()
     {
-        qDebug() << "OSGGeoTransformNode::updateSceneNode" << sceneNode;
+        // qDebug() << "OSGGeoTransformNode::updateSceneNode" << sceneNode;
         if (sceneNode && sceneNode->node()) {
             osgEarth::MapNode *mapNode = osgEarth::MapNode::findMapNode(sceneNode->node());
             if (mapNode) {
@@ -148,7 +148,7 @@ public:
 private slots:
     void onSceneNodeChanged(osg::Node *node)
     {
-        qDebug() << "OSGGeoTransformNode::onSceneNodeChanged" << node;
+        // qDebug() << "OSGGeoTransformNode::onSceneNodeChanged" << node;
         updateSceneNode();
         updatePosition();
     }
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp
index 95e1afb30..c5c655da2 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGGroup.cpp
@@ -88,7 +88,7 @@ public:
 
     void updateChildren()
     {
-        qDebug() << "OSGGroup::updateChildren";
+        // qDebug() << "OSGGroup::updateChildren";
 
         osg::Group *group = static_cast<osg::Group *>(self->node());
         if (!group) {
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp
index e14ac7541..17e2f21cc 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGSkyNode.cpp
@@ -70,7 +70,7 @@ public:
 
     bool acceptSceneNode(OSGNode *node)
     {
-        qDebug() << "OSGSkyNode::acceptSceneNode" << node;
+        // qDebug() << "OSGSkyNode::acceptSceneNode" << node;
         if (sceneNode == node) {
             return false;
         }
@@ -95,7 +95,7 @@ public:
             self->setNode(NULL);
             return;
         }
-        qDebug() << "OSGSkyNode::updateScene - scene node" << sceneNode->node();
+        // qDebug() << "OSGSkyNode::updateScene - scene node" << sceneNode->node();
         osgEarth::MapNode *mapNode = osgEarth::MapNode::findMapNode(sceneNode->node());
         if (!mapNode) {
             qWarning() << "OSGSkyNode::updateScene - scene node does not contain a map node";
@@ -151,12 +151,12 @@ public:
 
     void updateViewport()
     {
-        qDebug() << "OSGSkyNode::updateViewport" << skyNode;
+        // qDebug() << "OSGSkyNode::updateViewport" << skyNode;
         if (!skyNode.valid()) {
             qWarning() << "OSGSkyNode::updateViewport - invalid sky node" << skyNode;
             return;
         }
-        qDebug() << "OSGSkyNode::updateViewport - attaching to" << viewport->asView();
+        // qDebug() << "OSGSkyNode::updateViewport - attaching to" << viewport->asView();
         skyNode->attach(viewport->asView());
     }
 
@@ -216,7 +216,7 @@ public:
 private slots:
     void onSceneNodeChanged(osg::Node *node)
     {
-        qDebug() << "OSGSkyNode::onSceneNodeChanged" << node;
+        // qDebug() << "OSGSkyNode::onSceneNodeChanged" << node;
         updateScene();
     }
 };
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
index da8b28f66..a01a47280 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/OSGViewport.cpp
@@ -271,7 +271,7 @@ private slots:
 public:
     bool acceptSceneNode(OSGNode *node)
     {
-        qDebug() << "OSGViewport::acceptSceneNode" << node;
+        // qDebug() << "OSGViewport::acceptSceneNode" << node;
         if (sceneNode == node) {
             return true;
         }
@@ -291,7 +291,7 @@ public:
 
     bool acceptCameraNode(OSGCamera *node)
     {
-        qDebug() << "OSGViewport::acceptCameraNode" << node;
+        // qDebug() << "OSGViewport::acceptCameraNode" << node;
         if (cameraNode == node) {
             return true;
         }
@@ -311,7 +311,7 @@ public:
 
     bool acceptManipulator(OSGCameraManipulator *m)
     {
-        qDebug() << "OSGViewport::acceptManipulator" << manipulator;
+        // qDebug() << "OSGViewport::acceptManipulator" << manipulator;
         if (manipulator == m) {
             return true;
         }
@@ -370,7 +370,7 @@ private:
 
     void onAboutToBeDestroyed()
     {
-        qDebug() << "OSGViewport::Hidden::onAboutToBeDestroyed";
+        // qDebug() << "OSGViewport::Hidden::onAboutToBeDestroyed";
         osgQtQuick::openGLContextInfo(QOpenGLContext::currentContext(), "OSGViewport::Hidden::onAboutToBeDestroyed");
         // context is not current and don't know how to make it current...
     }
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp
index 96fbc7ff6..f97098bb8 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGCameraManipulator.cpp
@@ -69,7 +69,7 @@ public:
 
     bool acceptSceneNode(OSGNode *node)
     {
-        qDebug() << "OSGCameraManipulator::acceptSceneNode" << node;
+        // qDebug() << "OSGCameraManipulator::acceptSceneNode" << node;
         if (sceneNode == node) {
             return true;
         }
@@ -93,14 +93,14 @@ public:
             qWarning() << "OSGCameraManipulator::updateSceneNode - no scene node";
             return;
         }
-        qDebug() << "OSGCameraManipulator::updateSceneNode" << sceneNode;
+        // qDebug() << "OSGCameraManipulator::updateSceneNode" << sceneNode;
         manipulator->setNode(sceneNode->node());
     }
 
 private slots:
     void onSceneNodeChanged(osg::Node *node)
     {
-        qDebug() << "OSGCameraManipulator::onSceneNodeChanged" << node;
+        // qDebug() << "OSGCameraManipulator::onSceneNodeChanged" << node;
         updateSceneNode();
     }
 };
@@ -150,7 +150,7 @@ void OSGCameraManipulator::classBegin()
 
 void OSGCameraManipulator::componentComplete()
 {
-    qDebug() << "OSGCameraManipulator::componentComplete" << this;
+    // qDebug() << "OSGCameraManipulator::componentComplete" << this;
     update();
     clearDirty();
 }
diff --git a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp
index 1194054b7..b52c7a28f 100644
--- a/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp
+++ b/ground/gcs/src/libs/osgearth/osgQtQuick/ga/OSGNodeTrackerManipulator.cpp
@@ -65,7 +65,7 @@ public:
 
     bool acceptTrackNode(OSGNode *node)
     {
-        qDebug() << "OSGNodeTrackerManipulator::acceptTrackNode" << node;
+        // qDebug() << "OSGNodeTrackerManipulator::acceptTrackNode" << node;
         if (trackNode == node) {
             return false;
         }
@@ -89,7 +89,7 @@ public:
             qWarning() << "OSGNodeTrackerManipulator::updateTrackNode - no track node";
             return;
         }
-        qDebug() << "OSGNodeTrackerManipulator::updateTrackNode" << trackNode->node();
+        // qDebug() << "OSGNodeTrackerManipulator::updateTrackNode" << trackNode->node();
         manipulator->setTrackNode(trackNode->node());
     }
 
@@ -117,7 +117,7 @@ public:
 private slots:
     void onTrackNodeChanged(osg::Node *node)
     {
-        qDebug() << "OSGNodeTrackerManipulator::onTrackNodeChanged" << node;
+        // qDebug() << "OSGNodeTrackerManipulator::onTrackNodeChanged" << node;
         qWarning() << "OSGNodeTrackerManipulator::onTrackNodeChanged - needs to be implemented";
     }
 };
diff --git a/ground/gcs/src/plugins/antennatrack/antennatrackgadget.cpp b/ground/gcs/src/plugins/antennatrack/antennatrackgadget.cpp
index 2e818e612..e3dd367b2 100644
--- a/ground/gcs/src/plugins/antennatrack/antennatrackgadget.cpp
+++ b/ground/gcs/src/plugins/antennatrack/antennatrackgadget.cpp
@@ -89,7 +89,7 @@ void AntennaTrackGadget::loadConfiguration(IUAVGadgetConfiguration *config)
         }
     }
     m_widget->dataStreamGroupBox->setHidden(false);
-    qDebug() << "Using Telemetry parser";
+
     parser = new TelemetryParser();
 
     connect(parser, SIGNAL(position(double, double, double)), m_widget, SLOT(setPosition(double, double, double)));
diff --git a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
index f4177a8c4..0ee82ac1b 100644
--- a/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
+++ b/ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
@@ -874,7 +874,7 @@ void ConfigMultiRotorWidget::reverseMultirotorMotor()
 
 void ConfigMultiRotorWidget::updateAirframe(QString frameType)
 {
-    qDebug() << "ConfigMultiRotorWidget::updateAirframe - frame type" << frameType;
+    // qDebug() << "ConfigMultiRotorWidget::updateAirframe - frame type" << frameType;
 
     QString elementId;
     if (frameType == "Tri" || frameType == "Tricopter Y") {
diff --git a/ground/gcs/src/plugins/coreplugin/connectionmanager.cpp b/ground/gcs/src/plugins/coreplugin/connectionmanager.cpp
index a225b97e6..e70ce7fa5 100644
--- a/ground/gcs/src/plugins/coreplugin/connectionmanager.cpp
+++ b/ground/gcs/src/plugins/coreplugin/connectionmanager.cpp
@@ -441,7 +441,7 @@ void ConnectionManager::devChanged(IConnection *connection)
 
     updateConnectionDropdown();
 
-    qDebug() << "# devices " << m_devList.count();
+    qDebug() << "ConnectionManager::devChanged - device count:" << m_devList.count();
     emit availableDevicesChanged(m_devList);
 
 
@@ -464,9 +464,8 @@ void ConnectionManager::updateConnectionDropdown()
                 m_availableDevList->setCurrentIndex(m_availableDevList->count() - 1);
             }
             if (m_mainWindow->generalSettings()->autoConnect() && polling) {
-                qDebug() << "Automatically opening device";
+                qDebug() << "ConnectionManager::updateConnectionDropdown - auto-connecting USB device";
                 connectDevice(d);
-                qDebug() << "ConnectionManager::updateConnectionDropdown autoconnected USB device";
             }
         }
     }
diff --git a/ground/gcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp b/ground/gcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
index 17bf5a187..6aa57bda0 100644
--- a/ground/gcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
+++ b/ground/gcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
@@ -41,7 +41,6 @@
 #include <QtCore/QDebug>
 #include <QMessageBox>
 
-
 using namespace Core;
 
 static const UAVConfigVersion m_versionUAVGadgetConfigurations = UAVConfigVersion("1.2.0");
@@ -116,7 +115,7 @@ void UAVGadgetInstanceManager::readConfigs_1_2_0(QSettings *qs)
 
         configs = qs->childGroups();
         foreach(QString configName, configs) {
-            qDebug() << "Loading config: " << classId << "," << configName;
+            // qDebug() << "Loading config: " << classId << "," << configName;
             qs->beginGroup(configName);
             configInfo.read(qs);
             configInfo.setNameOfConfigurable(classId + "-" + configName);
@@ -166,7 +165,7 @@ void UAVGadgetInstanceManager::readConfigs_1_1_0(QSettings *qs)
 
         configs = qs->childGroups();
         foreach(QString configName, configs) {
-            qDebug().nospace() << "Loading config: " << classId << ", " << configName;
+            // qDebug().nospace() << "Loading config: " << classId << ", " << configName;
             qs->beginGroup(configName);
             bool locked = qs->value("config.locked").toBool();
             configInfo.setNameOfConfigurable(classId + "-" + configName);
@@ -250,8 +249,8 @@ void UAVGadgetInstanceManager::createOptionsPages()
             m_pm->addObject(page);
         } else {
             qWarning()
-                << "UAVGadgetInstanceManager::createOptionsPages - failed to create options page for configuration "
-                + config->classId() + ":" + config->name() + ", configuration will be removed.";
+                << "UAVGadgetInstanceManager::createOptionsPages - failed to create options page for configuration"
+                << (config->classId() + ":" + config->name()) << ", configuration will be removed.";
             // The m_optionsPages list and m_configurations list must be in synch otherwise nasty issues happen later
             // so if we fail to create an options page we must remove the associated configuration
             ite.remove();
diff --git a/ground/gcs/src/plugins/gpsdisplay/gpsdisplaygadget.cpp b/ground/gcs/src/plugins/gpsdisplay/gpsdisplaygadget.cpp
index 9763b7d0c..8e1b7b17e 100644
--- a/ground/gcs/src/plugins/gpsdisplay/gpsdisplaygadget.cpp
+++ b/ground/gcs/src/plugins/gpsdisplay/gpsdisplaygadget.cpp
@@ -91,7 +91,6 @@ void GpsDisplayGadget::loadConfiguration(IUAVGadgetConfiguration *config)
         }
         m_widget->dataStreamGroupBox->setHidden(false);
     } else if (gpsDisplayConfig->connectionMode() == "Telemetry") {
-        qDebug() << "Using Telemetry parser";
         parser = new TelemetryParser();
         m_widget->disconnectButton->setHidden(true);
         m_widget->connectButton->setHidden(true);
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
index e622362bf..6084c5610 100644
--- a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
@@ -67,7 +67,7 @@ QList<QQmlError> PfdQmlGadgetWidget::errors() const
 
 void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
 {
-    qDebug() << "PfdQmlGadgetWidget::loadConfiguration" << config->name();
+    // qDebug() << "PfdQmlGadgetWidget::loadConfiguration" << config->name();
 
     if (!m_quickWidgetProxy) {
         m_quickWidgetProxy = new QuickWidgetProxy(this);
@@ -85,7 +85,7 @@ void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
         layout()->addWidget(m_quickWidgetProxy->widget());
     }
 
-    setQmlFile("");
+    clear();
 
     m_pfdQmlContext->loadConfiguration(config);
 
@@ -110,28 +110,35 @@ void PfdQmlGadgetWidget::setQmlFile(QString fn)
     m_qmlFileName = fn;
 
     if (fn.isEmpty()) {
-        setSource(QUrl());
-
-        engine()->removeImageProvider("svg");
-        engine()->rootContext()->setContextProperty("svgRenderer", NULL);
-
-        // calling clearComponentCache() causes crashes (see https://bugreports.qt-project.org/browse/QTBUG-41465)
-        // but not doing it causes almost systematic crashes when switching PFD gadget to "Model View (Without Terrain)" configuration
-        engine()->clearComponentCache();
-    } else {
-        SvgImageProvider *svgProvider = new SvgImageProvider(fn);
-        engine()->addImageProvider("svg", svgProvider);
-
-        // it's necessary to allow qml side to query svg element position
-        engine()->rootContext()->setContextProperty("svgRenderer", svgProvider);
-
-        QUrl url = QUrl::fromLocalFile(fn);
-        engine()->setBaseUrl(url);
-
-        setSource(url);
+        clear();
+        return;
     }
+    SvgImageProvider *svgProvider = new SvgImageProvider(fn);
+    engine()->addImageProvider("svg", svgProvider);
+
+    // it's necessary to allow qml side to query svg element position
+    engine()->rootContext()->setContextProperty("svgRenderer", svgProvider);
+
+    QUrl url = QUrl::fromLocalFile(fn);
+    engine()->setBaseUrl(url);
+
+    setSource(url);
 
     foreach(const QQmlError &error, errors()) {
         qDebug() << "PfdQmlGadgetWidget - " << error.description();
     }
 }
+
+void PfdQmlGadgetWidget::clear()
+{
+    // qDebug() << "PfdQmlGadgetWidget::clear";
+
+    setSource(QUrl());
+
+    engine()->removeImageProvider("svg");
+    engine()->rootContext()->setContextProperty("svgRenderer", NULL);
+
+    // calling clearComponentCache() causes crashes (see https://bugreports.qt-project.org/browse/QTBUG-41465)
+    // but not doing it causes almost systematic crashes when switching PFD gadget to "Model View (Without Terrain)" configuration
+    engine()->clearComponentCache();
+}
diff --git a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
index 3bfdd1e2a..e23e3c109 100644
--- a/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
+++ b/ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
@@ -50,16 +50,18 @@ public:
     void restoreState(QSettings *);
 
 private:
+    QuickWidgetProxy *m_quickWidgetProxy;
+
+    PfdQmlContext *m_pfdQmlContext;
+    QString m_qmlFileName;
+
     void setQmlFile(QString);
+    void clear();
 
     void setSource(const QUrl &url);
     QQmlEngine *engine() const;
     QList<QQmlError> errors() const;
 
-    QuickWidgetProxy *m_quickWidgetProxy;
-
-    PfdQmlContext *m_pfdQmlContext;
-    QString m_qmlFileName;
 };
 
 #endif /* PFDQMLGADGETWIDGET_H_ */
diff --git a/ground/gcs/src/plugins/serialconnection/serialpluginconfiguration.cpp b/ground/gcs/src/plugins/serialconnection/serialpluginconfiguration.cpp
index 54c896781..933a01f40 100644
--- a/ground/gcs/src/plugins/serialconnection/serialpluginconfiguration.cpp
+++ b/ground/gcs/src/plugins/serialconnection/serialpluginconfiguration.cpp
@@ -73,12 +73,12 @@ void SerialPluginConfiguration::restoresettings()
 {
     settings->beginGroup(QLatin1String("SerialConnection"));
     QString str = (settings->value(QLatin1String("speed"), tr("")).toString());
-    qDebug() << "SerialPluginConfiguration::restoresettings - speed" << str;
     if (str.isEmpty()) {
         m_speed = "57600";
     } else {
         m_speed = str;
     }
+    // qDebug() << "SerialPluginConfiguration::restoresettings - speed" << str;
     settings->endGroup();
 }
 
diff --git a/ground/gcs/src/plugins/uavtalk/uavtalk.cpp b/ground/gcs/src/plugins/uavtalk/uavtalk.cpp
index 6f8afaf35..8bb246d90 100644
--- a/ground/gcs/src/plugins/uavtalk/uavtalk.cpp
+++ b/ground/gcs/src/plugins/uavtalk/uavtalk.cpp
@@ -59,7 +59,9 @@ UAVTalk::UAVTalk(QIODevice *iodev, UAVObjectManager *objMngr) : io(iodev), objMn
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>();
     useUDPMirror = settings->useUDPMirror();
-    qDebug() << "USE UDP:::::::::::." << useUDPMirror;
+    if (useUDPMirror) {
+        qDebug() << "UAVTalk::UAVTalk -*** UDP mirror is enabled ***";
+    }
     if (useUDPMirror) {
         udpSocketTx = new QUdpSocket(this);
         udpSocketRx = new QUdpSocket(this);
diff --git a/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp b/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
index d1a021e88..50d5490e7 100644
--- a/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
+++ b/ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
@@ -66,7 +66,7 @@ void RunningDeviceWidget::populate()
     myDevice->lblDeviceID->setText(QString("Device ID: ") + QString::number(id, 16));
     myDevice->lblBoardName->setText(deviceDescriptorStruct::idToBoardName(id));
     myDevice->lblHWRev->setText(QString(tr("HW Revision: ")) + QString::number(id & 0x00FF, 16));
-    qDebug() << "CRC" << utilMngr->getFirmwareCRC();
+    // qDebug() << "CRC" << utilMngr->getFirmwareCRC();
     myDevice->lblCRC->setText(QString(tr("Firmware CRC: ")) + QVariant(utilMngr->getFirmwareCRC()).toString());
     // DeviceID tells us what sort of HW we have detected:
     // display a nice icon: