diff --git a/src/main/java/dslab/mailbox/MailboxServer.java b/src/main/java/dslab/mailbox/MailboxServer.java
index fa0c166..29b1119 100644
--- a/src/main/java/dslab/mailbox/MailboxServer.java
+++ b/src/main/java/dslab/mailbox/MailboxServer.java
@@ -83,7 +83,6 @@ public class MailboxServer implements IMailboxServer, Runnable {
     @Command
     @Override
     public void shutdown() {
-        // TODO shutdown DMAPListener
         try {
             if (dmtpServerSocket != null)
                 dmtpServerSocket.close();