diff --git a/src/common/serialization.h b/src/common/serialization.h
index fcde8d5c..f361a624 100644
--- a/src/common/serialization.h
+++ b/src/common/serialization.h
@@ -87,9 +87,9 @@ class alignas(16) DynamicVstEvents {
      */
     VstEvents& as_c_events();
 
-    // XXX: The original `VstEvents` stuct hasonly one C-style array of
-    //      `VstEvent`s, but I've seen some implementation that have two. Is
-    //      this only for alignment or does this have an actual use?
+    /**
+     * Midi events are sent in batches.
+     */
     std::vector<VstEvent> events;
 
    private:
diff --git a/src/plugin/host-bridge.cpp b/src/plugin/host-bridge.cpp
index 2032f6b7..e3cabce5 100644
--- a/src/plugin/host-bridge.cpp
+++ b/src/plugin/host-bridge.cpp
@@ -25,10 +25,6 @@
 #include <iostream>
 #include <random>
 
-// TODO: I should track down the VST2 SDK for clarification on some of the
-//       implementation details, such as the use of intptr_t isntead of void*
-//       here.
-
 namespace bp = boost::process;
 // I'd rather use std::filesystem instead, but Boost.Process depends on
 // boost::filesystem
@@ -278,7 +274,6 @@ void HostBridge::process_replacing(AEffect* /*plugin*/,
     response =
         read_object(host_vst_process_replacing, response, process_buffer);
 
-    // TODO: Doesn't quite work yet, not sure which side is causing problems
     assert(response.buffers.size() == static_cast<size_t>(plugin.numOutputs));
     for (int channel = 0; channel < plugin.numOutputs; channel++) {
         std::copy(response.buffers[channel].begin(),
diff --git a/src/wine-host/plugin-bridge.cpp b/src/wine-host/plugin-bridge.cpp
index 5813dca8..b6c7c15f 100644
--- a/src/wine-host/plugin-bridge.cpp
+++ b/src/wine-host/plugin-bridge.cpp
@@ -226,8 +226,6 @@ class HostCallbackDataConverter : DefaultDataConverter {
             case audioMasterGetTime:
                 // Write the returned `VstTimeInfo` struct into a field and make
                 // the function return a poitner to it in the function below
-                // TODO: Start a time to update this on the host bridge once
-                //       it's been requested. Not sure if this is needed though!
                 time = *static_cast<const VstTimeInfo*>(
                     static_cast<const void*>(response.data->data()));
                 break;
diff --git a/src/wine-host/plugin-bridge.h b/src/wine-host/plugin-bridge.h
index b09da020..980c07ee 100644
--- a/src/wine-host/plugin-bridge.h
+++ b/src/wine-host/plugin-bridge.h
@@ -64,8 +64,6 @@ class PluginBridge {
     /**
      * With the `audioMasterGetTime` host callback the plugin expects the return
      * value from the calblack to be a pointer to a VstTimeInfo struct.
-     *
-     * TODO: Should this be updated automatically?
      */
     VstTimeInfo time_info;