diff --git a/src/indexer.cc b/src/indexer.cc
index 65ec641d..334286ee 100644
--- a/src/indexer.cc
+++ b/src/indexer.cc
@@ -1468,7 +1468,7 @@ std::vector<std::unique_ptr<IndexFile>> Parse(
   perf->index_parse = timer.ElapsedMicrosecondsAndReset();
 
   if (dump_ast)
-    Dump(tu->document_cursor());
+    Dump(clang_getTranslationUnitCursor(tu->cx_tu));
 
   return ParseWithTu(file_consumer_shared, perf, tu.get(), index, file, args,
                      unsaved_files);
@@ -1510,8 +1510,8 @@ std::vector<std::unique_ptr<IndexFile>> ParseWithTu(
   clang_IndexAction_dispose(index_action);
   // std::cerr << "!! [END] Indexing " << file << std::endl;
 
-  tu->document_cursor().VisitChildren(&VisitMacroDefinitionAndExpansions,
-                                      &param);
+  clang::Cursor(clang_getTranslationUnitCursor(tu->cx_tu))
+      .VisitChildren(&VisitMacroDefinitionAndExpansions, &param);
 
   perf->index_build = timer.ElapsedMicrosecondsAndReset();
 
diff --git a/src/libclangmm/TranslationUnit.cc b/src/libclangmm/TranslationUnit.cc
index 725db910..235c2ee2 100644
--- a/src/libclangmm/TranslationUnit.cc
+++ b/src/libclangmm/TranslationUnit.cc
@@ -89,7 +89,4 @@ TranslationUnit::~TranslationUnit() {
   clang_disposeTranslationUnit(cx_tu);
 }
 
-Cursor TranslationUnit::document_cursor() const {
-  return Cursor(clang_getTranslationUnitCursor(cx_tu));
-}
 }  // namespace clang
diff --git a/src/libclangmm/TranslationUnit.h b/src/libclangmm/TranslationUnit.h
index ba1c172d..cb64c550 100644
--- a/src/libclangmm/TranslationUnit.h
+++ b/src/libclangmm/TranslationUnit.h
@@ -27,8 +27,6 @@ class TranslationUnit {
   explicit TranslationUnit(CXTranslationUnit tu);
   ~TranslationUnit();
 
-  Cursor document_cursor() const;
-
   CXTranslationUnit cx_tu;
 };
 
diff --git a/src/query.cc b/src/query.cc
index 6caf3779..09283542 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -429,9 +429,6 @@ IndexUpdate::IndexUpdate(const IdMap& previous_id_map,
     bool did_add =                                                             \
         ComputeDifferenceForUpdate(previous, current, &removed, &added);       \
     if (did_add) {                                                             \
-      /*std::cerr << "Adding mergeable update on " << \ \ \ \ \ \                                                                             \
-       * current_def->def.short_name << " (" << current_def->def.usr << ") for \
-       * \ \ \ \ \ \ field " << #index_name << std::endl;*/                              \
       query_name.push_back(MergeableUpdate<type_id, type>(                     \
           current_id_map.ToQuery(current_def->id), added, removed));           \
     }                                                                          \