diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryView.ejs
index 9105cd29f0..a351f225c8 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryView.ejs
@@ -25,7 +25,7 @@
   <div id="queryContent">
     <ul class="arango-tab">
       <li><a href="#result" data-toggle="pill" id="result-switch">Result</a></li>
-      <li><a href="#explain" data-toggle="pill" id="explain-switch">Explain</a></li>
+      <!--<li><a href="#explain" data-toggle="pill" id="explain-switch">Explain</a></li>-->
       <li><a href="#query" data-toggle="pill" id="query-switch">Query</a></li>
       <li><a href="#customs" data-toggle="pill" id="customs-switch">My Queries</a></li>
     </ul>
@@ -61,7 +61,7 @@
             <div>
 
               <button id="submitQueryButton" class="button-success query-button">Submit</button>
-              <button id="explainQueryButton" class="button-success query-button">Explain</button>
+              <!--<button id="explainQueryButton" class="button-success query-button">Explain</button>-->
               <button id="clearQueryButton" class="button-close query-button">Clear</button>
               <div class="styled-select">
                 <select id="querySelect" class="query-select"/>
@@ -76,7 +76,7 @@
 
       </div>
     </div>
-
+<!--
     <div class="tab-content" id="tabContentExplain">
 
       <div class="tab-pane" id="explain">
@@ -90,7 +90,7 @@
       </div>
 
     </div>
-
+-->
     <div class="tab-content" id="tabContentResult">
 
       <div class="tab-pane" id="result">
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
index a91aba245d..4079f7b232 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
@@ -21,9 +21,9 @@
       "click #result-switch": "switchTab",
       "click #query-switch": "switchTab",
       'click #customs-switch': "switchTab",
-      'click #explain-switch': "switchTab",
+//      'click #explain-switch': "switchTab",
       'click #submitQueryButton': 'submitQuery',
-      'click #explainQueryButton': 'explainQuery',
+//      'click #explainQueryButton': 'explainQuery',
       'click #commentText': 'commentText',
       'click #uncommentText': 'uncommentText',
       'click #undoText': 'undoText',
@@ -670,7 +670,7 @@
         }
         return json;
       },
-
+      /*
       drawTree: function() {
         var treeHeight = 0;
         var heatmap = this.heatmap.bind(this);
@@ -761,11 +761,13 @@
           .attr("d", diagonal);
 
       },
+      */
 
       resize: function() {
-        this.drawTree();
+        // this.drawTree();
       },
 
+      /*
       showExplainPlan: function(plan) {
         $("svg#explainOutput").html();
         var nodes = plan.nodes;
@@ -777,11 +779,15 @@
           this.drawTree();
         }
       },
+      */
 
+     /*
       showExplainWarnings: function(warnings) {
         $(".explain-warnings").html(this.warningTemplate.render({warnings: warnings}));
       },
+      */
 
+      /*
       fillExplain: function(callback) {
         var self = this;
         $("svg#explainOutput").html();
@@ -805,6 +811,7 @@
           }
         });
       },
+      */
 
       fillResult: function(callback) {
         var self = this;
@@ -863,19 +870,21 @@
 
       submitQuery: function () {
         var outputEditor = ace.edit("queryOutput");
-        this.fillExplain();
+        // this.fillExplain();
         this.fillResult(this.switchTab.bind(this, "result-switch"));
         outputEditor.resize();
         var inputEditor = ace.edit("aqlEditor");
         this.deselect(inputEditor);
       },
 
+      /*
       explainQuery: function() {
         this.fillExplain(this.switchTab.bind(this, "explain-switch"));
         this.execPending = true;
         var inputEditor = ace.edit("aqlEditor");
         this.deselect(inputEditor);
       },
+      */
 
       // This function changes the focus onto the tab that has been clicked
       // it can be given an event-object or the id of the tab to switch to