diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc
index 333d73383d123fddf600f099db71112062d196ae..4fa648a3f12a754906f5bab0ffc0e12ad20fadd5 100644
--- a/src/uas/QGCUASParamManager.cc
+++ b/src/uas/QGCUASParamManager.cc
@@ -5,13 +5,11 @@
 #include <QMessageBox>
 
 #include "UASInterface.h"
-#include "UASParameterCommsMgr.h"
 
 QGCUASParamManager::QGCUASParamManager(QObject *parent) :
     QGCUASParamManagerInterface(parent),
     mav(NULL),
-    paramDataModel(this),
-    paramCommsMgr(NULL)
+    paramDataModel(this)
 {
 
 
@@ -25,8 +23,7 @@ QGCUASParamManager* QGCUASParamManager::initWithUAS(UASInterface* uas)
     loadParamMetaInfoCSV();
 
     paramDataModel.setUASID(mav->getUASID());
-    paramCommsMgr = new UASParameterCommsMgr(this);
-    paramCommsMgr->initWithUAS(uas);
+    paramCommsMgr.initWithUAS(uas);
 
     connectToModelAndComms();
 
@@ -36,10 +33,10 @@ QGCUASParamManager* QGCUASParamManager::initWithUAS(UASInterface* uas)
 void QGCUASParamManager::connectToModelAndComms()
 {
     // Pass along comms mgr status msgs
-    connect(paramCommsMgr, SIGNAL(parameterStatusMsgUpdated(QString,int)),
+    connect(&paramCommsMgr, SIGNAL(parameterStatusMsgUpdated(QString,int)),
             this, SIGNAL(parameterStatusMsgUpdated(QString,int)));
 
-    connect(paramCommsMgr, SIGNAL(parameterListUpToDate()),
+    connect(&paramCommsMgr, SIGNAL(parameterListUpToDate()),
             this, SIGNAL(parameterListUpToDate()));
 
     // Pass along data model updates
@@ -81,7 +78,7 @@ bool QGCUASParamManager::getParameterValue(int component, const QString& paramet
 void QGCUASParamManager::requestParameterUpdate(int component, const QString& parameter)
 {
     if (mav) {
-        paramCommsMgr->requestParameterUpdate(component,parameter);
+        paramCommsMgr.requestParameterUpdate(component,parameter);
     }
 }
 
@@ -95,7 +92,7 @@ void QGCUASParamManager::requestParameterList()
 {
     if (mav) {
         emit parameterStatusMsgUpdated(tr("Requested param list.. waiting"), UASParameterCommsMgr::ParamCommsStatusLevel_OK);
-        paramCommsMgr->requestParameterList();
+        paramCommsMgr.requestParameterList();
     }
 }
 
@@ -126,7 +123,7 @@ void QGCUASParamManager::setParameter(int compId, QString paramName, QVariant va
 
 void QGCUASParamManager::sendPendingParameters(bool persistAfterSend, bool forceSend)
 {
-    paramCommsMgr->sendPendingParameters(persistAfterSend, forceSend);
+    paramCommsMgr.sendPendingParameters(persistAfterSend, forceSend);
 }
 
 
@@ -156,7 +153,7 @@ void QGCUASParamManager::loadParamMetaInfoCSV()
     qDebug() << "loadParamMetaInfoCSV for autopilot: " << autopilot << " from file: " << fileName;
 
     if (!paramMetaFile.open(QIODevice::ReadOnly | QIODevice::Text))  {
-        qWarning() << "loadParamMetaInfoCSV couldn't open:" << fileName;
+        qDebug() << "loadParamMetaInfoCSV couldn't open:" << fileName;
         return;
     }
 
@@ -201,7 +198,7 @@ void QGCUASParamManager::copyVolatileParamsToPersistent()
         msgBox.exec();
     }
     else {
-        paramCommsMgr->writeParamsToPersistentStorage();
+        paramCommsMgr.writeParamsToPersistentStorage();
     }
 }
 
@@ -215,5 +212,5 @@ void QGCUASParamManager::copyPersistentParamsToVolatile()
 
 
 void QGCUASParamManager::requestRcCalibrationParamsUpdate() {
-    paramCommsMgr->requestRcCalibrationParamsUpdate();
+    paramCommsMgr.requestRcCalibrationParamsUpdate();
 }
diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h
index 156bf453dd06ad88b6c2b58b2bcb5402a3236c96..6d63ee9ee35ad4d624516cc3048160d6ac409dbc 100644
--- a/src/uas/QGCUASParamManager.h
+++ b/src/uas/QGCUASParamManager.h
@@ -8,11 +8,11 @@
 
 #include "UASParameterDataModel.h"
 #include "QGCUASParamManagerInterface.h"
+#include "UASParameterCommsMgr.h"
 
 //forward declarations
 class QTextStream;
 class UASInterface;
-class UASParameterCommsMgr;
 
 class QGCUASParamManager : public QGCUASParamManagerInterface
 {
@@ -125,7 +125,7 @@ protected:
     // Parameter data model
     UASInterface*           mav;   ///< The MAV this manager is controlling
     UASParameterDataModel  paramDataModel;///< Shared data model of parameters
-    UASParameterCommsMgr*   paramCommsMgr; ///< Shared comms mgr for parameters
+    UASParameterCommsMgr   paramCommsMgr; ///< Shared comms mgr for parameters
 
 };