diff --git a/Indexing/LiteralSubstitutionTree.cpp b/Indexing/LiteralSubstitutionTree.cpp
index 84c9c9c61d..7ae600b9d8 100644
--- a/Indexing/LiteralSubstitutionTree.cpp
+++ b/Indexing/LiteralSubstitutionTree.cpp
@@ -87,10 +87,10 @@ SLQueryResultIterator LiteralSubstitutionTree::getInstances(Literal* lit,
 //  return getResultIterator<InstancesIterator>(lit, complementary, true);
 
   if(retrieveSubstitutions) {
-#if VDEBUG
     NOT_IMPLEMENTED;
-#endif
+    /*
     return getResultIterator<InstancesIterator>(lit, complementary, true, false);
+    */
   }
 
   SLQueryResultIterator res=
diff --git a/Indexing/SubstitutionTree.cpp b/Indexing/SubstitutionTree.cpp
index 1207716fd3..beb7dcb970 100644
--- a/Indexing/SubstitutionTree.cpp
+++ b/Indexing/SubstitutionTree.cpp
@@ -996,6 +996,7 @@ SubstitutionTree::NodeIterator
   }
 }
 
+/*
 bool SubstitutionTree::GeneralizationsIterator::associate(TermList query, TermList node)
 {
   CALL("SubstitutionTree::GeneralizationsIterator::associate");
@@ -1021,8 +1022,9 @@ SubstitutionTree::NodeIterator
     }
   }
 }
+*/
 
-
+/*
 bool SubstitutionTree::InstancesIterator::associate(TermList query, TermList node)
 {
   CALL("SubstitutionTree::InstancesIterator::associate");
@@ -1047,4 +1049,5 @@ SubstitutionTree::NodeIterator
     }
   }
 }
+*/
 
diff --git a/Indexing/SubstitutionTree.hpp b/Indexing/SubstitutionTree.hpp
index 651c393c17..bf10fcedee 100644
--- a/Indexing/SubstitutionTree.hpp
+++ b/Indexing/SubstitutionTree.hpp
@@ -787,7 +787,7 @@ class SubstitutionTree
     Stack<UnificationConstraint> constraints;
   };
 
-
+/*
   class GeneralizationsIterator
   : public UnificationsIterator
   {
@@ -799,7 +799,8 @@ class SubstitutionTree
     virtual bool associate(TermList query, TermList node);
     virtual NodeIterator getNodeIterator(IntermediateNode* n);
   };
-
+*/
+/*
   class InstancesIterator
   : public UnificationsIterator
   {
@@ -810,6 +811,7 @@ class SubstitutionTree
     virtual bool associate(TermList query, TermList node);
     virtual NodeIterator getNodeIterator(IntermediateNode* n);
   };
+*/
 
 #if VDEBUG
 public: