diff --git a/Version/RFC6455/HandshakeVerifier.php b/Version/RFC6455/HandshakeVerifier.php
index 7fbf452..ea17d08 100644
--- a/Version/RFC6455/HandshakeVerifier.php
+++ b/Version/RFC6455/HandshakeVerifier.php
@@ -113,22 +113,6 @@ class HandshakeVerifier {
         return (16 === strlen(base64_decode((string)$val)));
     }
 
-    /**
-     * Verify Origin matches RFC6454 IF it is set
-     * Origin is an optional field
-     * @param string|null
-     * @return bool
-     * @todo Implement verification functionality - see section 4.2.1.7
-     */
-    public function verifyOrigin($val) {
-        if (null === $val) {
-            return true;
-        }
-
-        // logic here
-        return true;
-    }
-
     /**
      * Verify the version passed matches this RFC
      * @param string|int MUST equal 13|"13"
diff --git a/WsServer.php b/WsServer.php
index 24ea580..0373a14 100644
--- a/WsServer.php
+++ b/WsServer.php
@@ -216,7 +216,6 @@ class WsServer implements HttpServerInterface {
      * Close a connection with an HTTP response
      * @param \Ratchet\ConnectionInterface $conn
      * @param int                          $code HTTP status code
-     * @return void
      */
     protected function close(ConnectionInterface $conn, $code = 400) {
         $response = new Response($code, array(