diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
index 293e1916c1..a03077d0f3 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
@@ -189,7 +189,6 @@ public class WebSocketServerHandshaker00 extends WebSocketServerHandshaker {
 
         // Upgrade the connection and send the handshake response.
         future.addListener(new ChannelFutureListener() {
-            @Override
             public void operationComplete(ChannelFuture future) {
                 ChannelPipeline p = future.getChannel().getPipeline();
                 if (p.get(HttpChunkAggregator.class) != null) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
index b1357d3c88..a57945f69d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
@@ -18,15 +18,12 @@ package org.jboss.netty.handler.codec.http.websocketx;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.*;
 import static org.jboss.netty.handler.codec.http.HttpVersion.*;
 
-import java.io.UnsupportedEncodingException;
-
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
 import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
 import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
 import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
@@ -169,7 +166,6 @@ public class WebSocketServerHandshaker08 extends WebSocketServerHandshaker {
 
         // Upgrade the connection and send the handshake response.
         future.addListener(new ChannelFutureListener() {
-            @Override
             public void operationComplete(ChannelFuture future) {
                 ChannelPipeline p = future.getChannel().getPipeline();
                 if (p.get(HttpChunkAggregator.class) != null) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
index 5e525db846..e3bdfd4edc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
@@ -18,15 +18,12 @@ package org.jboss.netty.handler.codec.http.websocketx;
 import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.*;
 import static org.jboss.netty.handler.codec.http.HttpVersion.*;
 
-import java.io.UnsupportedEncodingException;
-
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
 import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
 import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
 import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
@@ -175,7 +172,6 @@ public class WebSocketServerHandshaker13 extends WebSocketServerHandshaker {
 
         // Upgrade the connection and send the handshake response.
         future.addListener(new ChannelFutureListener() {
-            @Override
             public void operationComplete(ChannelFuture future) {
                 ChannelPipeline p = future.getChannel().getPipeline();
                 if (p.get(HttpChunkAggregator.class) != null) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
index 7800691fe8..841e641bac 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerProtocolHandshakeHandler.java
@@ -69,7 +69,6 @@ public class WebSocketServerProtocolHandshakeHandler extends SimpleChannelUpstre
             } else {
                 final ChannelFuture handshakeFuture = handshaker.handshake(ctx.getChannel(), req);
                 handshakeFuture.addListener(new ChannelFutureListener() {
-                    @Override
                     public void operationComplete(ChannelFuture future) throws Exception {
                         if (!future.isSuccess()) {
                             //ctx.fireExceptionCaught(future.getCause());