diff --git a/src/Ratchet/Component/WebSocket/Version/HyBi10.php b/src/Ratchet/Component/WebSocket/Version/HyBi10.php
index 6894797..c6cf5f8 100644
--- a/src/Ratchet/Component/WebSocket/Version/HyBi10.php
+++ b/src/Ratchet/Component/WebSocket/Version/HyBi10.php
@@ -2,9 +2,6 @@
 namespace Ratchet\Component\WebSocket\Version;
 use Guzzle\Http\Message\RequestInterface;
 
-/**
- * @todo Note: Even though this is the "legacy" HyBi version, it's using the RFC Message and Frame classes - change if needed
- */
 class HyBi10 extends RFC6455 {
     public static function isProtocol(RequestInterface $request) {
         $version = (int)$request->getHeader('Sec-WebSocket-Version', -1);
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455.php b/src/Ratchet/Component/WebSocket/Version/RFC6455.php
index 529f577..edcfd3c 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455.php
+++ b/src/Ratchet/Component/WebSocket/Version/RFC6455.php
@@ -18,9 +18,6 @@ class RFC6455 implements VersionInterface {
         $this->_verifier = new HandshakeVerifier;
     }
 
-    /**
-     * @todo Change the request to be a Guzzle RequestInterface
-     */
     public static function isProtocol(RequestInterface $request) {
         $version = (int)$request->getHeader('Sec-WebSocket-Version', -1);
         return (13 === $version);
diff --git a/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php b/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php
index 01560d9..14f70d5 100644
--- a/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php
+++ b/src/Ratchet/Component/WebSocket/WebSocketComponentInterface.php
@@ -2,11 +2,6 @@
 namespace Ratchet\Component\WebSocket;
 use Ratchet\Component\MessageComponentInterface;
 
-/**
- * @todo App interfaces this (optionally) if is meant for WebSocket
- * @todo WebSocket checks if instanceof AppInterface, if so uses getSubProtocol() when doing handshake
- * @todo Pick a better name for this...
- */
 interface WebSocketComponentInterface extends MessageComponentInterface {
     /**
      * Currently instead of this, I'm setting header in the Connection object passed around...not sure which I like more
diff --git a/src/Ratchet/Socket.php b/src/Ratchet/Socket.php
index 6ef8652..8bea1dc 100644
--- a/src/Ratchet/Socket.php
+++ b/src/Ratchet/Socket.php
@@ -6,7 +6,6 @@ use Ratchet\Component\ProtocolInterface;
  * A wrapper for the PHP socket_ functions
  * @author Chris Boden <shout at chrisboden dot ca>
  * @link http://ca2.php.net/manual/en/book.sockets.php
- * @todo Possibly move this into Ratchet\Resource - another concrete could use streams
  */
 class Socket implements SocketInterface {
     /**