diff --git a/arangod/Aql/ExecutionPlan.cpp b/arangod/Aql/ExecutionPlan.cpp
index 711ad7bcf9..be131aed89 100644
--- a/arangod/Aql/ExecutionPlan.cpp
+++ b/arangod/Aql/ExecutionPlan.cpp
@@ -260,21 +260,6 @@ ExecutionNode* ExecutionPlan::registerNode (ExecutionNode* node) {
   return node;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief unregister a node to the plan
-////////////////////////////////////////////////////////////////////////////////
-
-void ExecutionPlan::unregisterNode (ExecutionNode* node) {
-  TRI_ASSERT(node != nullptr);
-  TRI_ASSERT(node->id() > 0);
-
-  auto it = _ids.find(node->id());
-  TRI_ASSERT(it != _ids.end());
-  TRI_ASSERT(it->second == node);
-
-  _ids.erase(it);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief creates a calculation node for an arbitrary expression
 ////////////////////////////////////////////////////////////////////////////////
@@ -946,6 +931,7 @@ std::vector<ExecutionNode*> ExecutionPlan::findNodesOfType (
 /// @brief check linkage of execution plan
 ////////////////////////////////////////////////////////////////////////////////
 
+#if 0
 class LinkChecker : public WalkerWorker<ExecutionNode> {
 
   public:
@@ -995,6 +981,8 @@ void ExecutionPlan::checkLinkage () {
   root()->walk(&checker);
 }
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief helper struct for findVarUsage
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/arangod/Aql/ExecutionPlan.h b/arangod/Aql/ExecutionPlan.h
index 5135fab37e..459b5a4b95 100644
--- a/arangod/Aql/ExecutionPlan.h
+++ b/arangod/Aql/ExecutionPlan.h
@@ -185,7 +185,9 @@ namespace triagens {
 /// @brief check linkage
 ////////////////////////////////////////////////////////////////////////////////
 
+#if 0
         void checkLinkage ();
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief determine and set _varsUsedLater and _valid and _varSetBy
@@ -221,12 +223,6 @@ namespace triagens {
 
         ExecutionNode* registerNode (ExecutionNode*);
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief unregister a node to the plan
-////////////////////////////////////////////////////////////////////////////////
-
-        void unregisterNode (ExecutionNode* node);
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief replaceNode, note that <newNode> must be registered with the plan
 /// before this method is called, also this does not delete the old