diff --git a/source/birchwood/protocol/messages.d b/source/birchwood/protocol/messages.d
index 2bc4b7d..7778ba0 100644
--- a/source/birchwood/protocol/messages.d
+++ b/source/birchwood/protocol/messages.d
@@ -13,15 +13,8 @@ import birchwood.client.exceptions;
 import birchwood.config.conninfo : ChecksMode;
 import birchwood.logging;
 
-// TODO: Before release we should remove this import
-import std.stdio : writeln;
-
 /* TODO: We could move these all to `package.d` */
 
-/**
-* Encoding/decoding primitives
-*/
-
 /** 
  * Encodes the provided message into a CRLF
  * terminated byte array