diff --git a/app/components/architecture-viewer.js b/app/components/architecture-viewer.js
index acc7b1292793a2c5ebfb4b9e8ea8d57b5a1da69a..be2f110a032b7e80eae206f451e9c13aad22cc6c 100644
--- a/app/components/architecture-viewer.js
+++ b/app/components/architecture-viewer.js
@@ -10,7 +10,7 @@ export default Ember.Component.extend({
     themes: Object.keys(Themes),
     layoutAlgorithms: [
         'cose',
-        'cose-bilkent', // broken
+        //'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18
         'cola',
         'grid',
         'concentric',
diff --git a/app/components/architecture-visualisation-cytoscape/component.js b/app/components/architecture-visualisation-cytoscape/component.js
index 199c423b8853809a46a2f59afbfdd1c43523d6d9..86f675528dc420dc77fa9a999b8c4b707b91f89e 100644
--- a/app/components/architecture-visualisation-cytoscape/component.js
+++ b/app/components/architecture-visualisation-cytoscape/component.js
@@ -25,7 +25,7 @@ export default Ember.Component.extend({
     }.observes('layout'),
     renderGraph: function() {
         this.debug('graph',this.get('theme'), this.get('graph'));
-        this.cytoscape = cytoscape({
+        this.rendering = cytoscape({
           container: this.element,
 
           boxSelectionEnabled: false,
@@ -33,7 +33,7 @@ export default Ember.Component.extend({
 
           style: cytoscapeStyle(this.get('theme')),
 
-          elements: _.cloneDeep(this.get('graph')), // TODO!
+          elements: _.cloneDeep(this.get('graph')),
 
           layout: {
             name: this.get('layoutAlgorithm'),
@@ -44,7 +44,8 @@ export default Ember.Component.extend({
           }
         });
 
+        // just for development purposes - TODO: remove
         window.cy = cytoscape;
-        window.cytoscape = this.cytoscape;
+        window.cytoscape = this.rendering;
     }.on('didInsertElement').observes('layoutAlgorithm', 'graph', 'theme')
 });
diff --git a/app/services/graphing-service.js b/app/services/graphing-service.js
index 5983992258b2d7e03a6c7fb423a23a4444f64557..0b42236136260dfb772a2adac7243f47aaa50a5f 100644
--- a/app/services/graphing-service.js
+++ b/app/services/graphing-service.js
@@ -7,7 +7,7 @@ export default Ember.Service.extend({
   createGraph(models) {
     this.debug('loaded models', models);
     const serviceInstances = models.serviceInstances;
-    const services = models.services;
+    // const services = models.services; // not used in current view
     const communicationInstances = models.communicationInstances;
     const nodeGroups = models.nodeGroups;
     const nodes = models.nodes;