diff --git a/src/ui/PrimaryFlightDisplay.cc b/src/ui/PrimaryFlightDisplay.cc
index 651500ea23c15295e1448ecddc4dcbc596cbbe2f..7910775fed9787faffaf80e8f007b34c0fe59b19 100644
--- a/src/ui/PrimaryFlightDisplay.cc
+++ b/src/ui/PrimaryFlightDisplay.cc
@@ -169,18 +169,13 @@ PrimaryFlightDisplay::PrimaryFlightDisplay(int width, int height, QWidget *paren
     setMinimumSize(120, 80);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
+    setActiveUAS(UASManager::instance()->getActiveUAS());
+
     // Connect with UAS signal
     //connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(UASDeleted(UASInterface*)), this, SLOT(forgetUAS(UASInterface*)));
     connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
 
-//    // Get a list of all existing UAS and - well attach to one of them. The first one.
-//    foreach (UASInterface* uas, UASManager::instance()->getUASList()) {
-//        addUAS(uas);
-//    }
-
-    setActiveUAS(UASManager::instance()->getActiveUAS());
-
     // Refresh timer
     refreshTimer->setInterval(updateInterval);
     //    connect(refreshTimer, SIGNAL(timeout()), this, SLOT(paintHUD()));