diff --git a/src/main/java/biz/nellemann/mdexpl/NetworkServiceCell.java b/src/main/java/biz/nellemann/mdexpl/NetworkServiceCell.java
index 40118ed..c01398f 100644
--- a/src/main/java/biz/nellemann/mdexpl/NetworkServiceCell.java
+++ b/src/main/java/biz/nellemann/mdexpl/NetworkServiceCell.java
@@ -33,10 +33,8 @@ public class NetworkServiceCell extends CharmListCell<NetworkService> {
         icon.setWidth(25);
         tile.setPrimaryGraphic(icon);
         tile.setOnMouseClicked(e -> {
-            System.out.println("Selected ->  " + itemProperty().get().getName() );
             clipboardContent.putString(itemProperty().get().getUrl());
             clipboard.setContent(clipboardContent);
-            // TODO: Copy to iOS / Android clipboard
         });
         setText(null);
     }
diff --git a/src/main/java/biz/nellemann/mdexpl/service/DiscoveryService.java b/src/main/java/biz/nellemann/mdexpl/service/DiscoveryService.java
index 80023b5..d72761d 100644
--- a/src/main/java/biz/nellemann/mdexpl/service/DiscoveryService.java
+++ b/src/main/java/biz/nellemann/mdexpl/service/DiscoveryService.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.inject.Singleton;
 import javax.jmdns.JmDNS;
 import java.io.IOException;
@@ -81,6 +82,18 @@ public class DiscoveryService {
     }
 
 
+    @PreDestroy
+    public void destroy() {
+        if(jmdns != null) {
+            try {
+                jmdns.close();
+            } catch (IOException e) {
+                log.error("destroy() - {}", e.getMessage());
+            }
+        }
+    }
+
+
     public void setObservableList(ObservableList<NetworkService> list) {
         this.observableList = list;
         services.forEach((item, color) -> {
@@ -90,4 +103,5 @@ public class DiscoveryService {
         });
     }
 
+
 }
diff --git a/src/main/java/biz/nellemann/mdexpl/view/MainPresenter.java b/src/main/java/biz/nellemann/mdexpl/view/MainPresenter.java
index 19fb28f..7c8d6a8 100644
--- a/src/main/java/biz/nellemann/mdexpl/view/MainPresenter.java
+++ b/src/main/java/biz/nellemann/mdexpl/view/MainPresenter.java
@@ -39,9 +39,9 @@ public class MainPresenter {
     private ResourceBundle resources;
 
     @FXML
-    private CharmListView charmListView;
+    private CharmListView<NetworkService, Integer> charmListView;
 
-    private ObservableList<NetworkService> devicesList = FXCollections.observableArrayList();
+    private final ObservableList<NetworkService> devicesList = FXCollections.observableArrayList();
 
 
     @FXML
@@ -62,7 +62,6 @@ public class MainPresenter {
         });
 
         discoveryService.setObservableList(devicesList);
-
         charmListView.setItems(devicesList);
         charmListView.setCellFactory(p -> new NetworkServiceCell());
     }