diff --git a/main.cpp b/main.cpp
index dc3f2d7a..d7450725 100644
--- a/main.cpp
+++ b/main.cpp
@@ -161,7 +161,6 @@ struct VarDef {
   std::optional<TypeId> declaring_type;
 
   // Usages.
-  //std::vector<clang::SourceLocation> initializations; // TODO: See if we can support this.
   std::vector<clang::SourceLocation> all_uses;
 
   VarDef(VarId id, const std::string& usr) : id(id), usr(usr) {
@@ -1814,7 +1813,6 @@ int main(int argc, char** argv) {
   */
 
   for (std::string path : GetFilesInFolder("tests")) {
-    // TODO: Fix all existing tests.
     //if (path != "tests/declaration_vs_definition/method.cc") continue;
     //if (path == "tests/usage/type_usage_declare_extern.cc") continue;
     //if (path != "tests/constructors/destructor.cc") continue;
@@ -1859,4 +1857,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-// TODO: ctor/dtor, copy ctor, class inheritance, method inheritance
\ No newline at end of file
+// TODO: ctor/dtor, copy ctor
\ No newline at end of file
diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc
index 9fec0515..c5e8f5a2 100644
--- a/tests/method_declaration.cc
+++ b/tests/method_declaration.cc
@@ -4,11 +4,8 @@ class Foo {
 
 /*
 // NOTE: Lack of declaring_type in functions and funcs in Foo is okay, because
-//       those are processed when we find the definition for Foo::foo.
-// TODO: Verify the strategy above works well with pure virtual interfaces and
-//       the like (ie, we need to provide a good outline view). We could just
-//       add the info in the declaration if the func is pure virtual - see
-//       clang_CXXMethod_isPureVirtual
+//       those are processed when we find the definition for Foo::foo. Pure
+//       virtuals are treated specially and get added to the type immediately.
 
 OUTPUT:
 {
diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc
index 9557b663..d696ce19 100644
--- a/tests/vars/class_static_member.cc
+++ b/tests/vars/class_static_member.cc
@@ -4,9 +4,6 @@ class Foo {
 Foo* Foo::member = nullptr;
 
 /*
-// TODO: Store both declaration and definition. It is very convenient to
-//       quickly change between them.
-
 OUTPUT:
 {
   "types": [{