diff --git a/src/plugin/host-bridge.cpp b/src/plugin/host-bridge.cpp
index 79f858b6..4ea6f798 100644
--- a/src/plugin/host-bridge.cpp
+++ b/src/plugin/host-bridge.cpp
@@ -167,8 +167,6 @@ HostBridge::HostBridge(audioMasterCallback host_callback)
     // Read the plugin's information from the Wine process. This can only be
     // done after we started accepting host callbacks as the plugin might do
     // this during initialization.
-    // XXX: If the plugin has crashed then this read should fail instead of
-    //      blocking indefinitely, check if this is the case
     plugin = read_object(vst_host_aeffect, plugin);
 }
 
diff --git a/src/plugin/plugin.cpp b/src/plugin/plugin.cpp
index aa00cecb..07e8569a 100644
--- a/src/plugin/plugin.cpp
+++ b/src/plugin/plugin.cpp
@@ -53,8 +53,6 @@ VST_EXPORT AEffect* VSTPluginMain(audioMasterCallback host_callback) {
         // received.
         HostBridge* bridge = new HostBridge(host_callback);
 
-        // TODO: Debug print information about the loaded plugin
-
         return &bridge->plugin;
     } catch (const std::exception& error) {
         std::cerr << "Error during initialization:" << std::endl;