diff --git a/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java b/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java
index 6b01532..d92c57b 100755
--- a/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java
+++ b/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java
@@ -68,7 +68,6 @@ public class NeutronQoSExecutor implements Runnable {
   private String token;
   private Map<String, String> creds;
   private List<org.openstack4j.model.network.Port> portList;
-  private Map<String, String> computeNodeMap;
   private Map<String, String> hostComputeNodeMap;
   private String delimiter_line;
 
@@ -79,7 +78,6 @@ public NeutronQoSExecutor(
       VimInstance v,
       Map<String, String> creds,
       List<org.openstack4j.model.network.Port> portList,
-      Map<String, String> computeNodeMap,
       Map<String, String> hostComputeNodeMap) {
     this.vnfrs = vnfrs;
     this.logger = LoggerFactory.getLogger(this.getClass());
@@ -88,7 +86,6 @@ public NeutronQoSExecutor(
     this.v = v;
     this.creds = creds;
     this.portList = portList;
-    this.computeNodeMap = computeNodeMap;
     this.hostComputeNodeMap = hostComputeNodeMap;
   }
 
@@ -120,15 +117,12 @@ public void run() {
                     + " -> "
                     + r.getQuality()
                     + " -> "
-                    + hostComputeNodeMap.get(vnfr.getName())
-                    + " -> "
-                    + computeNodeMap.get(hostComputeNodeMap.get(vnfr.getName())));
+                    + hostComputeNodeMap.get(vnfr.getName()));
           } catch (Exception e) {
             logger.warn("  Problem checking on compute node for " + r.getIp());
             logger.debug("/////////////////////////////////////");
             logger.debug(hostComputeNodeMap.toString());
             logger.debug("/////////////////////////////////////");
-            logger.debug(computeNodeMap.toString());
           }
         }
       }
diff --git a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java
index 798ae2c..f22b91a 100755
--- a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java
+++ b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java
@@ -399,13 +399,6 @@ private String getNeutronEndpoint(OSClient os, VimInstance vimInstance, String t
     return null;
   }
 
-  private Map<String, String> getComputeNodeMap(OSClient os) {
-    Map<String, String> computenode_ip_map = new HashMap<String, String>();
-    for (Hypervisor h : os.compute().hypervisors().list()) {
-      computenode_ip_map.put(h.getHypervisorHostname(), h.getHostIP());
-    }
-    return computenode_ip_map;
-  }
 
   private Map<String, String> getVnfHostNameComputeNodeMap(
       OSClient os, Set<VirtualNetworkFunctionRecord> vnfrs) {
@@ -440,7 +433,6 @@ private void startOpenStackNeutronQoSTask(
             v,
             creds,
             portList,
-            this.getComputeNodeMap(os),
             this.getVnfHostNameComputeNodeMap(os, vim_vnfrs_map.get(key)));
     qtScheduler.schedule(aqe, 1, TimeUnit.SECONDS);
   }
@@ -512,27 +504,6 @@ private void updateOpenStackOverview() {
                 for (VNFCInstance vnfci : vdu.getVnfc_instance()) {
                   VimInstance tmp_vim = this.getVimInstance(nfvo_nsr_req, vnfci.getVim_id());
                   OSClient tmp_os = getOSClient(tmp_vim);
-                  Map<String, String> tmp_computeNodeMap = getComputeNodeMap(tmp_os);
-                  if (tmp_computeNodeMap != null) {
-                    // We collect all involved compute nodes
-                    for (String key : tmp_computeNodeMap.keySet()) {
-                      boolean node_found = false;
-                      for (int i = 0; i < complete_computeNodeMap.size(); i++) {
-                        if (complete_computeNodeMap.get(i).get("name").equals(key)) {
-                          node_found = true;
-                        }
-                      }
-                      if (!node_found) {
-                        HashMap<String, Object> tmp_node_entry = new HashMap<String, Object>();
-                        //tmp_node_entry.put(key, tmp_computeNodeMap.get(key));
-                        tmp_node_entry.put("vnfs", new ArrayList<HashMap<String, String>>());
-                        tmp_node_entry.put("node_ip", tmp_computeNodeMap.get(key));
-                        tmp_node_entry.put("name", key);
-
-                        complete_computeNodeMap.add(tmp_node_entry);
-                      }
-                    }
-                  }
 
                   Map<String, String> tmp_vnf_computeNodeMap =
                       getVnfHostNameComputeNodeMap(tmp_os, nsr.getVnfr());
@@ -566,7 +537,7 @@ private void updateOpenStackOverview() {
                               //    "Entry "
                               //        + vnfci.getHostname()
                               //        + " already added to "
-                              //        + current_compute_node);
+                              //        + current_compute_node); 
                             } else {
                               //logger.debug(
                               //    "adding " + vnfci.getHostname() + " to " + current_compute_node);