diff --git a/src/command_line.cc b/src/command_line.cc
index 215290ea..3604aca3 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -138,8 +138,7 @@ bool QueryDbMainLoop(QueryDatabase* db,
     }
 
     if (message) {
-      LOG_S(FATAL) << "Exiting; no handler for " << message->GetMethodType();
-      exit(1);
+      LOG_S(ERROR) << "No handler for " << message->GetMethodType();
     }
   }
 
diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc
index 5af936cd..37440fa9 100644
--- a/src/messages/initialize.cc
+++ b/src/messages/initialize.cc
@@ -175,6 +175,7 @@ MAKE_REFLECT_STRUCT(lsServerCapabilities,
                     completionProvider,
                     signatureHelpProvider,
                     definitionProvider,
+                    typeDefinitionProvider,
                     referencesProvider,
                     documentHighlightProvider,
                     documentSymbolProvider,
@@ -484,20 +485,6 @@ struct Handler_Initialize : BaseMessageHandler<In_InitializeRequest> {
       Out_InitializeResponse out;
       out.id = request->id;
 
-      // out.result.capabilities.textDocumentSync =
-      // lsTextDocumentSyncOptions();
-      // out.result.capabilities.textDocumentSync->openClose = true;
-      // out.result.capabilities.textDocumentSync->change =
-      // lsTextDocumentSyncKind::Full;
-      // out.result.capabilities.textDocumentSync->willSave = true;
-      // out.result.capabilities.textDocumentSync->willSaveWaitUntil =
-      // true;
-
-#if USE_CLANG_CXX
-      out.result.capabilities.documentFormattingProvider = true;
-      out.result.capabilities.documentRangeFormattingProvider = true;
-#endif
-
       QueueManager::WriteStdout(kMethodType, out);
 
       // Set project root.
diff --git a/src/threaded_queue.h b/src/threaded_queue.h
index 5b3608a8..f72950e0 100644
--- a/src/threaded_queue.h
+++ b/src/threaded_queue.h
@@ -2,18 +2,14 @@
 
 #include "utils.h"
 
-#include <optional>
-
-#include <algorithm>
 #include <atomic>
 #include <condition_variable>
 #include <deque>
 #include <mutex>
+#include <optional>
 #include <tuple>
 #include <utility>
 
-// TODO: cleanup includes.
-
 struct BaseThreadQueue {
   virtual bool IsEmpty() = 0;
   virtual ~BaseThreadQueue() = default;