diff --git a/src/main/java/org/jboss/netty/channel/ChannelLocal.java b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
index f269c3dcc2..cff8effe04 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelLocal.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
@@ -37,7 +37,10 @@ public class ChannelLocal<T> {
 
 
     private final ChannelFutureListener remover = new ChannelFutureListener() {
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture)
+         */
         public void operationComplete(ChannelFuture future) throws Exception {
             remove(future.getChannel());
         }
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
index bf0538cbd1..63ef259110 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
@@ -15,7 +15,6 @@
  */
 package org.jboss.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.fireChannelBound;
 import static org.jboss.netty.channel.Channels.fireChannelOpen;
 
 import java.nio.channels.SocketChannel;
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
index d5612313ec..e593e6c876 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
@@ -249,7 +249,6 @@ class NioDatagramChannel extends AbstractChannel
          * This method first delegates to {@link LinkedTransferQueue#offer(Object)} and
          * adds support for keeping track of the size of the this write buffer.
          */
-        @Override
         public boolean offer(MessageEvent e) {
             boolean success = queue.offer(e);
             assert success;
@@ -275,7 +274,6 @@ class NioDatagramChannel extends AbstractChannel
          * This method first delegates to {@link LinkedTransferQueue#poll()} and
          * adds support for keeping track of the size of the this writebuffers queue.
          */
-        @Override
         public MessageEvent poll() {
             MessageEvent e = queue.poll();
             if (e != null) {
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
index b00c669aec..d33aced3b8 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
@@ -196,7 +196,10 @@ class NioSocketChannel extends AbstractChannel
             super();
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.concurrent.BlockingQueue#offer(java.lang.Object)
+         */
         public boolean offer(MessageEvent e) {
             boolean success = queue.offer(e);
             assert success;
@@ -218,7 +221,10 @@ class NioSocketChannel extends AbstractChannel
             return true;
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.Queue#poll()
+         */
         public MessageEvent poll() {
             MessageEvent e = queue.poll();
             if (e != null) {
diff --git a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
index 5dc08a5f67..ad7d9c442d 100644
--- a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
@@ -286,7 +286,10 @@ public class OrderedMemoryAwareThreadPoolExecutor extends
         ChildExecutor() {
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.util.concurrent.Executor#execute(java.lang.Runnable)
+         */
         public void execute(Runnable command) {
             // TODO: What todo if the add return false ?
             tasks.add(command);
@@ -297,7 +300,10 @@ public class OrderedMemoryAwareThreadPoolExecutor extends
             }
         }
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see java.lang.Runnable#run()
+         */
         public void run() {
             // check if its already running by using CAS. If so just return here. So in the worst case the thread
             // is executed and do nothing
diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
index e4256f5631..41c3c276eb 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -200,7 +200,10 @@ public class SslHandler extends FrameDecoder
     
     private static final ChannelFutureListener HANDSHAKE_LISTENER = new ChannelFutureListener() {
 
-        @Override
+        /*
+         * (non-Javadoc)
+         * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture)
+         */
         public void operationComplete(ChannelFuture future) throws Exception {
             if (!future.isSuccess()) {
                 Channels.fireExceptionCaught(future.getChannel(), future.getCause());