diff --git a/lib/Ratchet/Command/Action/CloseConnection.php b/lib/Ratchet/Command/Action/CloseConnection.php
index 6061231..dfbf540 100644
--- a/lib/Ratchet/Command/Action/CloseConnection.php
+++ b/lib/Ratchet/Command/Action/CloseConnection.php
@@ -6,7 +6,6 @@ use Ratchet\SocketObserver;
 
 /**
  * Close the connection to the sockets passed in the constructor
- * @todo The server does not seem to be notified when a resource is closed by this class...
  */
 class CloseConnection implements ActionInterface {
     /**
diff --git a/lib/Ratchet/Socket.php b/lib/Ratchet/Socket.php
index 0a4e5b1..f24f97a 100644
--- a/lib/Ratchet/Socket.php
+++ b/lib/Ratchet/Socket.php
@@ -63,7 +63,6 @@ class Socket implements SocketInterface {
      * @param int
      * @throws \InvalidArgumentException
      * @throws Exception
-     * @todo See if this crack-pot scheme works!
      */
     public function select(&$read, &$write, &$except, $tv_sec, $tv_usec = 0) {
         $read   = static::mungForSelect($read);
diff --git a/lib/Ratchet/SocketObserver.php b/lib/Ratchet/SocketObserver.php
index 415ae5b..d9b917f 100644
--- a/lib/Ratchet/SocketObserver.php
+++ b/lib/Ratchet/SocketObserver.php
@@ -24,6 +24,7 @@ interface SocketObserver {
      * This is called just before the connection is closed
      * @param SocketInterface
      * @return Command\CommandInterface|NULL
+     * @todo This is triggered if the client or server terminates the connection; consider a new onDisconnect if server triggered
      */
     function onClose(SocketInterface $conn);
 }
\ No newline at end of file