diff --git a/src/ui/linechart/Linecharts.cc b/src/ui/linechart/Linecharts.cc
index 750e082020d02f0663b63ddbe40b48223c1c8543..6e97aaef4365d2e6a01747b8d95990a97fcf042c 100644
--- a/src/ui/linechart/Linecharts.cc
+++ b/src/ui/linechart/Linecharts.cc
@@ -18,10 +18,7 @@ Linecharts::Linecharts(QWidget *parent) :
     foreach (UASInterface* sys, systems) {
         addSystem(sys);
     }
-    connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)),
-            this, SLOT(addSystem(UASInterface*)));
-    connect(UASManager::instance(), SIGNAL(activeUASSet(int)),
-            this, SLOT(selectSystem(int)));
+    connect(UASManager::instance(), &UASManager::UASCreated, this, &Linecharts::addSystem);
 }
 
 void Linecharts::showEvent(QShowEvent* event)
@@ -59,32 +56,6 @@ void Linecharts::hideEvent(QHideEvent* event)
     emit visibilityChanged(false);
 }
 
-void Linecharts::selectSystem(int systemid)
-{
-	Q_UNUSED(systemid);
-//    QWidget* prevWidget = currentWidget();
-//    if (prevWidget)
-//    {
-//        LinechartWidget* chart = dynamic_cast<LinechartWidget*>(prevWidget);
-//        if (chart)
-//        {
-//            chart->setActive(false);
-//            chart->setActiveSystem(systemid);
-//        }
-//    }
-//    QWidget* widget = plots.value(systemid, NULL);
-//    if (widget)
-//    {
-//        setCurrentWidget(widget);
-//        LinechartWidget* chart = dynamic_cast<LinechartWidget*>(widget);
-//        if (chart)
-//        {
-//            chart->setActive(true);
-//            chart->setActiveSystem(systemid);
-//        }
-//    }
-}
-
 void Linecharts::addSystem(UASInterface* uas)
 {
     // FIXME Add removeSystem() call
diff --git a/src/ui/linechart/Linecharts.h b/src/ui/linechart/Linecharts.h
index 20474b760999e3a98f42832aceab582462ba60fb..ced7734ebaee1e585dae4ed82eed52c8196025cf 100644
--- a/src/ui/linechart/Linecharts.h
+++ b/src/ui/linechart/Linecharts.h
@@ -20,8 +20,6 @@ signals:
     void visibilityChanged(bool visible);
 
 public slots:
-    /** @brief Select plot for one system */
-    void selectSystem(int systemid);
     /** @brief Add a new system to the list of plots */
     void addSystem(UASInterface* uas);
     /** @brief Add a new generic message source (not a system) */