diff --git a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
index a4dd24dd39..8ceb2375ed 100644
--- a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
@@ -55,7 +55,6 @@ public class Bootstrap implements ExternalResourceReleasable {
      * I/O operation is requested.
      */
     protected Bootstrap() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
index 113afafd1c..6b5d7860d8 100644
--- a/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
@@ -113,7 +113,6 @@ public class ClientBootstrap extends Bootstrap {
      * operation is requested.
      */
     public ClientBootstrap() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java
index 07b905d969..3e0fbc0880 100644
--- a/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java
@@ -122,7 +122,6 @@ public class ConnectionlessBootstrap extends Bootstrap {
      * operation is requested.
      */
     public ConnectionlessBootstrap() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
index 5a968f56dc..8107d413a5 100644
--- a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
@@ -165,7 +165,6 @@ public class ServerBootstrap extends Bootstrap {
      * operation is requested.
      */
     public ServerBootstrap() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
index 431867b011..3bdc3cf6ab 100644
--- a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
@@ -717,11 +717,11 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
         // New readerIndex and writerIndex will become 0 and
         // (previous writerIndex - previous readerIndex) respectively.
 
-        final int localReaderIndex = this.readerIndex();
+        final int localReaderIndex = readerIndex();
         if (localReaderIndex == 0) {
             return;
         }
-        int localWriterIndex = this.writerIndex();
+        int localWriterIndex = writerIndex();
 
         final int bytesToMove = capacity() - localReaderIndex;
         List<ChannelBuffer> list = decompose(localReaderIndex, bytesToMove);
@@ -744,14 +744,14 @@ public class CompositeChannelBuffer extends AbstractChannelBuffer {
         int localMarkedReaderIndex = localReaderIndex;
         try {
             resetReaderIndex();
-            localMarkedReaderIndex = this.readerIndex();
+            localMarkedReaderIndex = readerIndex();
         } catch (IndexOutOfBoundsException e) {
             // ignore
         }
         int localMarkedWriterIndex = localWriterIndex;
         try {
             resetWriterIndex();
-            localMarkedWriterIndex = this.writerIndex();
+            localMarkedWriterIndex = writerIndex();
         } catch (IndexOutOfBoundsException e) {
             // ignore
         }
diff --git a/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
index 178e098fef..16a17bf6c2 100644
--- a/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
+++ b/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
@@ -99,7 +99,7 @@ public class DirectChannelBufferFactory extends AbstractChannelBufferFactory {
                     "preallocatedBufCapacity must be greater than 0: " + preallocatedBufferCapacity);
         }
 
-        this.preallocatedBufCapacity = preallocatedBufferCapacity;
+        preallocatedBufCapacity = preallocatedBufferCapacity;
     }
 
     public ChannelBuffer getBuffer(ByteOrder order, int capacity) {
diff --git a/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
index 9fc7cf699b..b158287572 100644
--- a/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
+++ b/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
@@ -53,7 +53,6 @@ public class HeapChannelBufferFactory extends AbstractChannelBufferFactory {
      * {@link ByteOrder#BIG_ENDIAN}.
      */
     public HeapChannelBufferFactory() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/AbstractChannel.java b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
index bf18266827..18ac83e35b 100644
--- a/src/main/java/org/jboss/netty/channel/AbstractChannel.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
@@ -146,7 +146,7 @@ public abstract class AbstractChannel implements Channel {
      */
     @Override
     public final int hashCode() {
-        return this.id;
+        return id;
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
index 9284118eb4..eb32d2e099 100644
--- a/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
@@ -26,7 +26,6 @@ public abstract class AbstractChannelSink implements ChannelSink {
      * Creates a new instance.
      */
     protected AbstractChannelSink() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/ChannelException.java b/src/main/java/org/jboss/netty/channel/ChannelException.java
index 3b48e2eae5..f33654c28d 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelException.java
@@ -28,7 +28,6 @@ public class ChannelException extends RuntimeException {
      * Creates a new exception.
      */
     public ChannelException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/ChannelHandler.java b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
index 31c163385b..9712a9adf0 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
@@ -15,6 +15,9 @@
  */
 package org.jboss.netty.channel;
 
+import org.jboss.netty.bootstrap.Bootstrap;
+import org.jboss.netty.channel.group.ChannelGroup;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -22,9 +25,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jboss.netty.bootstrap.Bootstrap;
-import org.jboss.netty.channel.group.ChannelGroup;
-
 /**
  * Handles or intercepts a {@link ChannelEvent}, and sends a
  * {@link ChannelEvent} to the next handler in a {@link ChannelPipeline}.
@@ -224,7 +224,7 @@ public interface ChannelHandler {
     @Documented
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.RUNTIME)
-    public @interface Sharable {
+    @interface Sharable {
         // no value
     }
 }
diff --git a/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java b/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
index b63a1f8d97..f374765b54 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
@@ -30,7 +30,6 @@ public class ChannelHandlerLifeCycleException extends RuntimeException {
      * Creates a new exception.
      */
     public ChannelHandlerLifeCycleException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
index 493f222ad8..276465c5b0 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
@@ -30,7 +30,6 @@ public class ChannelPipelineException extends ChannelException {
      * Creates a new instance.
      */
     public ChannelPipelineException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
index 76ab364799..0d69e0a69c 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
@@ -230,7 +230,7 @@ public class DefaultChannelFuture implements ChannelFuture {
                 checkDeadLock();
                 waiters++;
                 try {
-                    this.wait();
+                    wait();
                 } finally {
                     waiters--;
                 }
@@ -255,7 +255,7 @@ public class DefaultChannelFuture implements ChannelFuture {
                 checkDeadLock();
                 waiters++;
                 try {
-                    this.wait();
+                    wait();
                 } catch (InterruptedException e) {
                     interrupted = true;
                 } finally {
@@ -309,7 +309,7 @@ public class DefaultChannelFuture implements ChannelFuture {
                 try {
                     for (;;) {
                         try {
-                            this.wait(waitTime / 1000000, (int) (waitTime % 1000000));
+                            wait(waitTime / 1000000, (int) (waitTime % 1000000));
                         } catch (InterruptedException e) {
                             if (interruptable) {
                                 throw e;
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
index 034052d92d..6cd68835f8 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
@@ -790,7 +790,6 @@ public class DefaultChannelPipeline implements ChannelPipeline {
 
     private static final class DiscardingChannelSink implements ChannelSink {
         DiscardingChannelSink() {
-            super();
         }
 
         public void eventSunk(ChannelPipeline pipeline, ChannelEvent e) {
diff --git a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
index e884afd419..fd94a38550 100644
--- a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
+++ b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
@@ -207,7 +207,7 @@ public class DefaultChannelGroupFuture implements ChannelGroupFuture {
                 checkDeadLock();
                 waiters++;
                 try {
-                    this.wait();
+                    wait();
                 } finally {
                     waiters--;
                 }
@@ -232,7 +232,7 @@ public class DefaultChannelGroupFuture implements ChannelGroupFuture {
                 checkDeadLock();
                 waiters++;
                 try {
-                    this.wait();
+                    wait();
                 } catch (InterruptedException e) {
                     interrupted = true;
                 } finally {
@@ -286,7 +286,7 @@ public class DefaultChannelGroupFuture implements ChannelGroupFuture {
                 try {
                     for (;;) {
                         try {
-                            this.wait(waitTime / 1000000, (int) (waitTime % 1000000));
+                            wait(waitTime / 1000000, (int) (waitTime % 1000000));
                         } catch (InterruptedException e) {
                             if (interruptable) {
                                 throw e;
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
index 6e18e9e37c..7f2efcf574 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioChannel.java
@@ -15,7 +15,15 @@
  */
 package org.jboss.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
+import org.jboss.netty.util.internal.ThreadLocalBoolean;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.SelectableChannel;
@@ -27,15 +35,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
-import org.jboss.netty.util.internal.ThreadLocalBoolean;
+import static org.jboss.netty.channel.Channels.*;
 
 abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChannel> extends AbstractChannel {
 
@@ -103,7 +103,7 @@ abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChan
             ChannelSink sink, AbstractNioWorker worker, C ch) {
         super(id, parent, factory, pipeline, sink);
         this.worker = worker;
-        this.channel = ch;
+        channel = ch;
     }
 
     protected AbstractNioChannel(
@@ -111,7 +111,7 @@ abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChan
             ChannelPipeline pipeline, ChannelSink sink, AbstractNioWorker worker, C ch)  {
         super(parent, factory, pipeline, sink);
         this.worker = worker;
-        this.channel = ch;
+        channel = ch;
     }
 
     /**
@@ -164,7 +164,7 @@ abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChan
     }
 
     void setRawInterestOpsNow(int interestOps) {
-        super.setInterestOpsNow(interestOps);
+        setInterestOpsNow(interestOps);
     }
 
 
@@ -214,7 +214,7 @@ abstract class AbstractNioChannel<C extends SelectableChannel & WritableByteChan
         private final Queue<MessageEvent> queue;
 
         public WriteRequestQueue() {
-            this.queue = new ConcurrentLinkedQueue<MessageEvent>();
+            queue = new ConcurrentLinkedQueue<MessageEvent>();
         }
 
         public MessageEvent remove() {
diff --git a/src/main/java/org/jboss/netty/handler/codec/PrematureChannelClosureException.java b/src/main/java/org/jboss/netty/handler/codec/PrematureChannelClosureException.java
index ac48d04b9e..9859d4987a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/PrematureChannelClosureException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/PrematureChannelClosureException.java
@@ -26,7 +26,6 @@ public class PrematureChannelClosureException extends Exception {
     private static final long serialVersionUID = 233460005724966593L;
 
     public PrematureChannelClosureException() {
-        super();
     }
 
     public PrematureChannelClosureException(String msg) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
index edaa007f8f..fdd8d27a76 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
@@ -199,7 +199,7 @@ public enum Base64Dialect {
     final byte[] decodabet;
     final boolean breakLinesByDefault;
 
-    private Base64Dialect(byte[] alphabet, byte[] decodabet, boolean breakLinesByDefault) {
+    Base64Dialect(byte[] alphabet, byte[] decodabet, boolean breakLinesByDefault) {
         this.alphabet = alphabet;
         this.decodabet = decodabet;
         this.breakLinesByDefault = breakLinesByDefault;
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java b/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
index 6340a1eada..93a1c3e44b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
@@ -29,7 +29,6 @@ public class CompressionException extends RuntimeException {
      * Creates a new instance.
      */
     public CompressionException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
index 97ce3036c4..8e897b2008 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
@@ -54,6 +54,5 @@ final class ZlibUtil {
     }
 
     private ZlibUtil() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
index 8f7e2be1c8..62ab085e39 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
@@ -183,7 +183,6 @@ abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {
 
     private final class EmbeddedChannelSink implements ChannelSink, ChannelUpstreamHandler {
         EmbeddedChannelSink() {
-            super();
         }
 
         public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) {
@@ -229,7 +228,6 @@ abstract class AbstractCodecEmbedder<E> implements CodecEmbedder<E> {
     private static final class EmbeddedChannelPipeline extends DefaultChannelPipeline {
 
         EmbeddedChannelPipeline() {
-            super();
         }
 
         @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
index 865dcd2224..b7ed82f236 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
@@ -28,7 +28,6 @@ public class CodecEmbedderException extends RuntimeException {
      * Creates a new instance.
      */
     public CodecEmbedderException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
index 12204fa760..cc7f67a4d8 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
@@ -68,6 +68,6 @@ public class DecoderEmbedder<E> extends AbstractCodecEmbedder<E> {
 
     public boolean offer(Object input) {
         fireMessageReceived(getChannel(), input);
-        return !super.isEmpty();
+        return !isEmpty();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
index d5fc9f074a..4bc78296ed 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
@@ -26,7 +26,6 @@ final class EmbeddedChannelFactory implements ChannelFactory {
     static final ChannelFactory INSTANCE = new EmbeddedChannelFactory();
 
     private EmbeddedChannelFactory() {
-        super();
     }
 
     public Channel newChannel(ChannelPipeline pipeline) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java b/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
index c701b0466a..9e7d6fe154 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
@@ -29,7 +29,6 @@ public class CorruptedFrameException extends Exception {
      * Creates a new instance.
      */
     public CorruptedFrameException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
index 2e5dec4783..4557a5a37e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
@@ -29,7 +29,6 @@ public class TooLongFrameException extends Exception {
      * Creates a new instance.
      */
     public TooLongFrameException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
index 0cd8d95cf7..56aed2dc12 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
@@ -47,7 +47,6 @@ public class CookieDecoder {
      * Creates a new decoder.
      */
     public CookieDecoder() {
-        super();
     }
 
     /**
@@ -55,7 +54,6 @@ public class CookieDecoder {
      */
     @Deprecated
     public CookieDecoder(@SuppressWarnings("unused") boolean lenient) {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
index 64f82611f5..cc03196dcc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
@@ -199,7 +199,7 @@ public class HttpChunkAggregator extends SimpleChannelUpstreamHandler implements
     }
 
     protected void appendToCumulation(ChannelBuffer input) {
-        ChannelBuffer cumulation = this.currentMessage.getContent();
+        ChannelBuffer cumulation = currentMessage.getContent();
         if (cumulation instanceof CompositeChannelBuffer) {
             // Make sure the resulting cumulation buffer has no more than the configured components.
             CompositeChannelBuffer composite = (CompositeChannelBuffer) cumulation;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
index 8f16f5e880..7e7a2b242e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
@@ -100,7 +100,6 @@ public class HttpClientCodec implements ChannelUpstreamHandler,
     private final class Encoder extends HttpRequestEncoder {
 
         Encoder() {
-            super();
         }
 
         @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
index 8105f67fd9..c3e6c3fbfc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
@@ -130,6 +130,5 @@ final class HttpCodecUtil {
     }
 
     private HttpCodecUtil() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
index 36d5137a12..06f9068b72 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
@@ -53,7 +53,6 @@ public abstract class HttpContentDecoder extends SimpleChannelUpstreamHandler
      * Creates a new instance.
      */
     protected HttpContentDecoder() {
-        super();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
index 184ff6b0d8..ef2f3a18d4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
@@ -59,7 +59,6 @@ public abstract class HttpContentEncoder extends SimpleChannelHandler
      * Creates a new instance.
      */
     protected HttpContentEncoder() {
-        super();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
index 875a0c49ed..4c634b0bbb 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
@@ -334,7 +334,6 @@ public class HttpHeaders {
         public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
 
         private Names() {
-            super();
         }
     }
 
@@ -473,7 +472,6 @@ public class HttpHeaders {
         public static final String WEBSOCKET = "WebSocket";
 
         private Values() {
-            super();
         }
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
index 20e9550af4..f9fb4fe09a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
@@ -114,7 +114,7 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
      * <em>Internal use only</em>.
      * @apiviz.exclude
      */
-    protected static enum State {
+    protected enum State {
         SKIP_CONTROL_CHARS,
         READ_INITIAL,
         READ_HEADER,
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
index 5dc6e126eb..a2fd419c3c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
@@ -56,7 +56,6 @@ public abstract class HttpMessageEncoder extends OneToOneEncoder {
      * Creates a new instance.
      */
     protected HttpMessageEncoder() {
-        super();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
index 6843be6468..f99a2107e0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
@@ -60,7 +60,6 @@ public class HttpRequestDecoder extends HttpMessageDecoder {
      * {@code maxChunkSize (8192)}.
      */
     public HttpRequestDecoder() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
index 450eeba11e..d44a24c436 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
@@ -89,7 +89,6 @@ public class HttpResponseDecoder extends HttpMessageDecoder {
      * {@code maxChunkSize (8192)}.
      */
     public HttpResponseDecoder() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
index a30769eb18..024ed32970 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
@@ -52,7 +52,6 @@ public abstract class OneToOneDecoder implements ChannelUpstreamHandler {
      * Creates a new instance with the current system character set.
      */
     protected OneToOneDecoder() {
-        super();
     }
 
     public void handleUpstream(
diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
index 1dc29fa756..909b1c2c03 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
@@ -46,7 +46,6 @@ import org.jboss.netty.handler.codec.frame.Delimiters;
 public abstract class OneToOneEncoder implements ChannelDownstreamHandler {
 
     protected OneToOneEncoder() {
-        super();
     }
 
     public void handleDownstream(
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
index 8b7c19328e..48200eb13e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
@@ -310,7 +310,7 @@ public abstract class ReplayingDecoder<T extends Enum<T>>
 
     protected ReplayingDecoder(T initialState, boolean unfold) {
         super(unfold);
-        this.state = initialState;
+        state = initialState;
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
index 10d1c1a11d..e05574e7aa 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
@@ -31,7 +31,6 @@ public class UnreplayableOperationException extends
      * Creates a new instance.
      */
     public UnreplayableOperationException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
index 9150ba9743..a75bf3e1c2 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
@@ -207,7 +207,6 @@ public final class RtspHeaders {
         public static final String WWW_AUTHENTICATE = HttpHeaders.Names.WWW_AUTHENTICATE;
 
         private Names() {
-            super();
         }
     }
 
@@ -385,11 +384,9 @@ public final class RtspHeaders {
         public static final String URL = "url";
 
         protected Values() {
-            super();
         }
     }
 
     private RtspHeaders() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
index 72b16a5632..6f2731c266 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
@@ -36,7 +36,6 @@ public abstract class RtspMessageEncoder extends HttpMessageEncoder {
      * Creates a new instance.
      */
     protected RtspMessageEncoder() {
-        super();
     }
 
     @Override
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
index 1470d4807b..7560d825f0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
@@ -136,6 +136,5 @@ public final class RtspMethods {
     }
 
     private RtspMethods() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
index 54990e44e1..ea0a89f883 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
@@ -56,7 +56,6 @@ public class RtspRequestDecoder extends RtspMessageDecoder {
      * {@code maxContentLength (8192)}.
      */
     public RtspRequestDecoder() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
index f284c873d8..6b7e66c896 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
@@ -57,7 +57,6 @@ public class RtspResponseDecoder extends RtspMessageDecoder {
      * {@code maxContentLength (8192)}.
      */
     public RtspResponseDecoder() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
index 665ac118f1..adc50f73ba 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
@@ -290,6 +290,5 @@ public final class RtspResponseStatuses {
     }
 
     private RtspResponseStatuses() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
index 8735ba0860..017a298265 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
@@ -48,6 +48,5 @@ public final class RtspVersions {
     }
 
     private RtspVersions() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java
index 5603a3c04b..df0f7e2607 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/DefaultSpdyHeadersFrame.java
@@ -33,7 +33,6 @@ public class DefaultSpdyHeadersFrame extends DefaultSpdyHeaderBlock
      * @param streamId the Stream-ID of this frame
      */
     public DefaultSpdyHeadersFrame(int streamId) {
-        super();
         setStreamId(streamId);
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
index 78a80b2e79..8cb31e6032 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyFrameDecoder.java
@@ -52,7 +52,7 @@ public class SpdyFrameDecoder extends FrameDecoder {
     private int numHeaders;
     private ChannelBuffer decompressed;
 
-    private static enum State {
+    private enum State {
         READ_COMMON_HEADER,
         READ_CONTROL_FRAME,
         READ_SETTINGS_FRAME,
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
index 6e899636da..e91d1328b6 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaders.java
@@ -63,7 +63,6 @@ public class SpdyHeaders {
         public static final String VERSION = ":version";
 
         private HttpNames() {
-            super();
         }
     }
 
@@ -94,7 +93,6 @@ public class SpdyHeaders {
         public static final String VERSION = "version";
 
         private Spdy2HttpNames() {
-            super();
         }
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpDecoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpDecoder.java
index cd2e11c358..8967fbb18a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpDecoder.java
@@ -68,7 +68,6 @@ public class SpdyHttpDecoder extends OneToOneDecoder {
      *        a {@link TooLongFrameException} will be raised.
      */
     public SpdyHttpDecoder(int version, int maxContentLength) {
-        super();
         if (version < SPDY_MIN_VERSION || version > SPDY_MAX_VERSION) {
             throw new IllegalArgumentException(
                     "unsupported version: " + version);
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
index 3ba9b586a2..29d0d03463 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHttpHeaders.java
@@ -52,7 +52,6 @@ public final class SpdyHttpHeaders {
         public static final String SCHEME = "X-SPDY-Scheme";
 
         private Names() {
-            super();
         }
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyOrHttpChooser.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyOrHttpChooser.java
index 70d8eebec0..59221684c9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyOrHttpChooser.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyOrHttpChooser.java
@@ -36,7 +36,7 @@ import org.jboss.netty.handler.ssl.SslHandler;
  */
 public abstract class SpdyOrHttpChooser implements ChannelUpstreamHandler {
 
-    public static enum SelectedProtocol {
+    public enum SelectedProtocol {
         SpdyVersion2,
         SpdyVersion3,
         HttpVersion1_1,
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyProtocolException.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyProtocolException.java
index 7c9c993fe5..8e17f5687a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyProtocolException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyProtocolException.java
@@ -28,7 +28,6 @@ public class SpdyProtocolException extends Exception {
      * Creates a new instance.
      */
     public SpdyProtocolException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySession.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySession.java
index 51e7bfad9b..b200b5e1ec 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySession.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySession.java
@@ -256,7 +256,6 @@ final class SpdySession {
     private final class PriorityComparator implements Comparator<Integer> {
 
         PriorityComparator() {
-            super();
         }
 
         public int compare(Integer id1, Integer id2) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandler.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandler.java
index 1cb40613b3..25753d93ed 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandler.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandler.java
@@ -87,7 +87,6 @@ public class SpdySessionHandler extends SimpleChannelUpstreamHandler
      *                handle the client endpoint of the connection.
      */
     public SpdySessionHandler(int version, boolean server) {
-        super();
         if (version < SPDY_MIN_VERSION || version > SPDY_MAX_VERSION) {
             throw new IllegalArgumentException(
                     "unsupported version: " + version);
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
index 603397abbb..5038de8d03 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
@@ -78,10 +78,10 @@ public class IpFilterRuleList extends ArrayList<IpFilterRule> {
 
         boolean allow = rule.startsWith("+");
         if (rule.charAt(1) == 'n' || rule.charAt(1) == 'i') {
-            this.add(new PatternRule(allow, rule.substring(1)));
+            add(new PatternRule(allow, rule.substring(1)));
         } else if (rule.charAt(1) == 'c') {
             try {
-                this.add(new IpSubnetFilterRule(allow, rule.substring(3)));
+                add(new IpSubnetFilterRule(allow, rule.substring(3)));
             } catch (UnknownHostException e) {
                 if (logger.isErrorEnabled()) {
                     logger.error("error parsing ip filter " + rule, e);
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
index cd86b3313c..662d7fe425 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
@@ -15,12 +15,12 @@
  */
 package org.jboss.netty.handler.ipfilter;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 /**
  * This class allows to check if an IP V4 or V6 Address is contained in a subnet.<BR>
  * <p/>
@@ -101,7 +101,7 @@ public class IpSubnet implements IpSet, Comparable<IpSubnet> {
      */
     public boolean contains(String ipAddr) throws UnknownHostException {
         InetAddress inetAddress1 = InetAddress.getByName(ipAddr);
-        return this.contains(inetAddress1);
+        return contains(inetAddress1);
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
index 5b86584400..f94f0b10c1 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
@@ -133,7 +133,7 @@ public class IpV4Subnet implements IpSet, Comparable<IpV4Subnet> {
      */
     private void setNetId(String netId) throws UnknownHostException {
         InetAddress inetAddress1 = InetAddress.getByName(netId);
-        this.setNetId(inetAddress1);
+        setNetId(inetAddress1);
     }
 
     /**
@@ -199,7 +199,7 @@ public class IpV4Subnet implements IpSet, Comparable<IpV4Subnet> {
      */
     public boolean contains(String ipAddr) throws UnknownHostException {
         InetAddress inetAddress1 = InetAddress.getByName(ipAddr);
-        return this.contains(inetAddress1);
+        return contains(inetAddress1);
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java b/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
index ee50be245d..a34bd2a2aa 100644
--- a/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
@@ -30,7 +30,6 @@ public class BlockingReadTimeoutException extends InterruptedIOException {
      * Creates a new instance.
      */
     public BlockingReadTimeoutException() {
-        super();
     }
 
     /**
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 55a7e290de..f5a75e15c9 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -481,7 +481,7 @@ public class SslHandler extends FrameDecoder
         if (ctx != null) {
             throw new IllegalStateException("Can only get changed before attached to ChannelPipeline");
         }
-        this.closeOnSSLException = closeOnSslException;
+        closeOnSSLException = closeOnSslException;
     }
 
     public boolean getCloseOnSSLException() {
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
index b61fc660de..e2dd6e2142 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
@@ -498,7 +498,6 @@ public class IdleStateHandler extends SimpleChannelUpstreamHandler
         volatile Timeout allIdleTimeout;
 
         State() {
-            super();
         }
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
index 5fa1fb9c1c..90ef82923a 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
@@ -27,7 +27,6 @@ public class ReadTimeoutException extends TimeoutException {
      * Creates a new instance.
      */
     public ReadTimeoutException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
index bb10b5b199..4999d8c57d 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
@@ -289,7 +289,6 @@ public class ReadTimeoutHandler extends SimpleChannelUpstreamHandler
         volatile long lastReadTime = System.currentTimeMillis();
 
         State() {
-            super();
         }
     }
 }
diff --git a/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
index 7d23724aeb..2c1ee73a81 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
@@ -29,7 +29,6 @@ public class TimeoutException extends ChannelException {
      * Creates a new instance.
      */
     public TimeoutException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
index 78e9963c62..f934f27991 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
@@ -28,7 +28,6 @@ public class WriteTimeoutException extends TimeoutException {
      * Creates a new instance.
      */
     public WriteTimeoutException() {
-        super();
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
index 87df6e086a..562de08509 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -273,8 +273,8 @@ public abstract class AbstractTrafficShapingHandler extends
      */
     public void configure(long newWriteLimit, long newReadLimit,
             long newCheckInterval) {
-        this.configure(newWriteLimit, newReadLimit);
-        this.configure(newCheckInterval);
+        configure(newWriteLimit, newReadLimit);
+        configure(newCheckInterval);
     }
 
     /**
diff --git a/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java b/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
index 7ddb57e911..66a19aa9a4 100644
--- a/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
+++ b/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
@@ -26,7 +26,6 @@ public abstract class AbstractInternalLogger implements InternalLogger {
      * Creates a new instance.
      */
     protected AbstractInternalLogger() {
-        super();
     }
 
     public boolean isEnabled(InternalLogLevel level) {
diff --git a/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java b/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
index a74dccda7e..793395525a 100644
--- a/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
+++ b/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
@@ -41,6 +41,5 @@ public final class ExternalResourceUtil {
     }
 
     private ExternalResourceUtil() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java b/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
index 7091edbc7b..1e233640be 100644
--- a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
+++ b/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
@@ -363,7 +363,6 @@ public class HashedWheelTimer implements Timer {
         private long tick;
 
         Worker() {
-            super();
         }
 
         public void run() {
diff --git a/src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java b/src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java
index 8c2258e777..077eb1af11 100644
--- a/src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java
+++ b/src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java
@@ -25,7 +25,6 @@ public final class CaseIgnoringComparator implements Comparator<String>, Seriali
     public static final CaseIgnoringComparator INSTANCE = new CaseIgnoringComparator();
 
     private CaseIgnoringComparator() {
-        super();
     }
 
     public int compare(String o1, String o2) {
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
index bd016a8726..57f5fdc029 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
@@ -611,7 +611,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
         }
         segmentShift = 32 - sshift;
         segmentMask = ssize - 1;
-        this.segments = Segment.newArray(ssize);
+        segments = Segment.newArray(ssize);
 
         if (initialCapacity > MAXIMUM_CAPACITY) {
             initialCapacity = MAXIMUM_CAPACITY;
@@ -625,8 +625,8 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
             cap <<= 1;
         }
 
-        for (int i = 0; i < this.segments.length; ++ i) {
-            this.segments[i] = new Segment<K, V>(cap, loadFactor);
+        for (int i = 0; i < segments.length; ++ i) {
+            segments[i] = new Segment<K, V>(cap, loadFactor);
         }
     }
 
@@ -1178,11 +1178,11 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
             extends HashIterator implements ReusableIterator<K>, Enumeration<K> {
 
         public K next() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
 
         public K nextElement() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
     }
 
@@ -1190,11 +1190,11 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
             extends HashIterator implements ReusableIterator<V>, Enumeration<V> {
 
         public V next() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
 
         public V nextElement() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
     }
 
@@ -1214,8 +1214,8 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
         }
 
         public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key = entry.getKey();
-            this.value = entry.getValue();
+            key = entry.getKey();
+            value = entry.getValue();
 
         }
 
@@ -1283,7 +1283,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
                 throw new NullPointerException();
             }
             V v = super.setValue(value);
-            ConcurrentHashMap.this.put(getKey(), value);
+            put(getKey(), value);
             return v;
         }
 
@@ -1292,7 +1292,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
     final class EntryIterator extends HashIterator implements
             ReusableIterator<Entry<K, V>> {
         public Map.Entry<K, V> next() {
-            HashEntry<K, V> e = super.nextEntry();
+            HashEntry<K, V> e = nextEntry();
             return new WriteThroughEntry(e.key(), e.value());
         }
     }
@@ -1316,7 +1316,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentHashMap.this.containsKey(o);
+            return containsKey(o);
         }
 
         @Override
@@ -1349,7 +1349,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentHashMap.this.containsValue(o);
+            return containsValue(o);
         }
 
         @Override
@@ -1370,7 +1370,7 @@ public final class ConcurrentHashMap<K, V> extends AbstractMap<K, V>
                 return false;
             }
             Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-            V v = ConcurrentHashMap.this.get(e.getKey());
+            V v = get(e.getKey());
             return v != null && v.equals(e.getValue());
         }
 
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
index 7baba13eb8..f3932c2f11 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
@@ -611,7 +611,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
         }
         segmentShift = 32 - sshift;
         segmentMask = ssize - 1;
-        this.segments = Segment.newArray(ssize);
+        segments = Segment.newArray(ssize);
 
         if (initialCapacity > MAXIMUM_CAPACITY) {
             initialCapacity = MAXIMUM_CAPACITY;
@@ -625,8 +625,8 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
             cap <<= 1;
         }
 
-        for (int i = 0; i < this.segments.length; ++ i) {
-            this.segments[i] = new Segment<K, V>(cap, loadFactor);
+        for (int i = 0; i < segments.length; ++ i) {
+            segments[i] = new Segment<K, V>(cap, loadFactor);
         }
     }
 
@@ -1178,11 +1178,11 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
             extends HashIterator implements ReusableIterator<K>, Enumeration<K> {
 
         public K next() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
 
         public K nextElement() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
     }
 
@@ -1190,11 +1190,11 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
             extends HashIterator implements ReusableIterator<V>, Enumeration<V> {
 
         public V next() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
 
         public V nextElement() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
     }
 
@@ -1214,8 +1214,8 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
         }
 
         public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key = entry.getKey();
-            this.value = entry.getValue();
+            key = entry.getKey();
+            value = entry.getValue();
 
         }
 
@@ -1283,7 +1283,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
                 throw new NullPointerException();
             }
             V v = super.setValue(value);
-            ConcurrentIdentityHashMap.this.put(getKey(), value);
+            put(getKey(), value);
             return v;
         }
 
@@ -1292,7 +1292,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
     final class EntryIterator extends HashIterator implements
             ReusableIterator<Entry<K, V>> {
         public Map.Entry<K, V> next() {
-            HashEntry<K, V> e = super.nextEntry();
+            HashEntry<K, V> e = nextEntry();
             return new WriteThroughEntry(e.key(), e.value());
         }
     }
@@ -1316,7 +1316,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentIdentityHashMap.this.containsKey(o);
+            return containsKey(o);
         }
 
         @Override
@@ -1349,7 +1349,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentIdentityHashMap.this.containsValue(o);
+            return containsValue(o);
         }
 
         @Override
@@ -1370,7 +1370,7 @@ public final class ConcurrentIdentityHashMap<K, V> extends AbstractMap<K, V>
                 return false;
             }
             Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-            V v = ConcurrentIdentityHashMap.this.get(e.getKey());
+            V v = get(e.getKey());
             return v != null && v.equals(e.getValue());
         }
 
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
index 5a8e1d5003..21bd5d1a7e 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
@@ -192,8 +192,8 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
                 ReferenceQueue<Object> refQueue) {
             this.hash = hash;
             this.next = next;
-            this.keyRef = new WeakKeyReference<K>(key, hash, refQueue);
-            this.valueRef = value;
+            keyRef = new WeakKeyReference<K>(key, hash, refQueue);
+            valueRef = value;
         }
 
         @SuppressWarnings("unchecked")
@@ -215,7 +215,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
         }
 
         void setValue(V value) {
-            this.valueRef = value;
+            valueRef = value;
         }
 
         @SuppressWarnings("unchecked")
@@ -675,7 +675,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
         }
         segmentShift = 32 - sshift;
         segmentMask = ssize - 1;
-        this.segments = Segment.newArray(ssize);
+        segments = Segment.newArray(ssize);
 
         if (initialCapacity > MAXIMUM_CAPACITY) {
             initialCapacity = MAXIMUM_CAPACITY;
@@ -689,8 +689,8 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
             cap <<= 1;
         }
 
-        for (int i = 0; i < this.segments.length; ++ i) {
-            this.segments[i] = new Segment<K, V>(cap, loadFactor);
+        for (int i = 0; i < segments.length; ++ i) {
+            segments[i] = new Segment<K, V>(cap, loadFactor);
         }
     }
 
@@ -1258,11 +1258,11 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
             extends HashIterator implements ReusableIterator<K>, Enumeration<K> {
 
         public K next() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
 
         public K nextElement() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
     }
 
@@ -1270,11 +1270,11 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
             extends HashIterator implements ReusableIterator<V>, Enumeration<V> {
 
         public V next() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
 
         public V nextElement() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
     }
 
@@ -1294,8 +1294,8 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
         }
 
         public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key = entry.getKey();
-            this.value = entry.getValue();
+            key = entry.getKey();
+            value = entry.getValue();
 
         }
 
@@ -1363,7 +1363,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
                 throw new NullPointerException();
             }
             V v = super.setValue(value);
-            ConcurrentIdentityWeakKeyHashMap.this.put(getKey(), value);
+            put(getKey(), value);
             return v;
         }
 
@@ -1372,7 +1372,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
     final class EntryIterator extends HashIterator implements
             ReusableIterator<Entry<K, V>> {
         public Map.Entry<K, V> next() {
-            HashEntry<K, V> e = super.nextEntry();
+            HashEntry<K, V> e = nextEntry();
             return new WriteThroughEntry(e.key(), e.value());
         }
     }
@@ -1396,7 +1396,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentIdentityWeakKeyHashMap.this.containsKey(o);
+            return containsKey(o);
         }
 
         @Override
@@ -1429,7 +1429,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentIdentityWeakKeyHashMap.this.containsValue(o);
+            return containsValue(o);
         }
 
         @Override
@@ -1450,7 +1450,7 @@ public final class ConcurrentIdentityWeakKeyHashMap<K, V> extends AbstractMap<K,
                 return false;
             }
             Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-            V v = ConcurrentIdentityWeakKeyHashMap.this.get(e.getKey());
+            V v = get(e.getKey());
             return v != null && v.equals(e.getValue());
         }
 
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
index 578c2eedd4..2bf5b22e22 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
@@ -192,8 +192,8 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
                 ReferenceQueue<Object> refQueue) {
             this.hash = hash;
             this.next = next;
-            this.keyRef = new WeakKeyReference<K>(key, hash, refQueue);
-            this.valueRef = value;
+            keyRef = new WeakKeyReference<K>(key, hash, refQueue);
+            valueRef = value;
         }
 
         @SuppressWarnings("unchecked")
@@ -215,7 +215,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
         }
 
         void setValue(V value) {
-            this.valueRef = value;
+            valueRef = value;
         }
 
         @SuppressWarnings("unchecked")
@@ -675,7 +675,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
         }
         segmentShift = 32 - sshift;
         segmentMask = ssize - 1;
-        this.segments = Segment.newArray(ssize);
+        segments = Segment.newArray(ssize);
 
         if (initialCapacity > MAXIMUM_CAPACITY) {
             initialCapacity = MAXIMUM_CAPACITY;
@@ -689,8 +689,8 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
             cap <<= 1;
         }
 
-        for (int i = 0; i < this.segments.length; ++ i) {
-            this.segments[i] = new Segment<K, V>(cap, loadFactor);
+        for (int i = 0; i < segments.length; ++ i) {
+            segments[i] = new Segment<K, V>(cap, loadFactor);
         }
     }
 
@@ -1258,11 +1258,11 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
             extends HashIterator implements ReusableIterator<K>, Enumeration<K> {
 
         public K next() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
 
         public K nextElement() {
-            return super.nextEntry().key();
+            return nextEntry().key();
         }
     }
 
@@ -1270,11 +1270,11 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
             extends HashIterator implements ReusableIterator<V>, Enumeration<V> {
 
         public V next() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
 
         public V nextElement() {
-            return super.nextEntry().value();
+            return nextEntry().value();
         }
     }
 
@@ -1294,8 +1294,8 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
         }
 
         public SimpleEntry(Entry<? extends K, ? extends V> entry) {
-            this.key = entry.getKey();
-            this.value = entry.getValue();
+            key = entry.getKey();
+            value = entry.getValue();
 
         }
 
@@ -1363,7 +1363,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
                 throw new NullPointerException();
             }
             V v = super.setValue(value);
-            ConcurrentWeakKeyHashMap.this.put(getKey(), value);
+            put(getKey(), value);
             return v;
         }
 
@@ -1372,7 +1372,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
     final class EntryIterator extends HashIterator implements
             ReusableIterator<Entry<K, V>> {
         public Map.Entry<K, V> next() {
-            HashEntry<K, V> e = super.nextEntry();
+            HashEntry<K, V> e = nextEntry();
             return new WriteThroughEntry(e.key(), e.value());
         }
     }
@@ -1396,7 +1396,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentWeakKeyHashMap.this.containsKey(o);
+            return containsKey(o);
         }
 
         @Override
@@ -1429,7 +1429,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
 
         @Override
         public boolean contains(Object o) {
-            return ConcurrentWeakKeyHashMap.this.containsValue(o);
+            return containsValue(o);
         }
 
         @Override
@@ -1450,7 +1450,7 @@ public final class ConcurrentWeakKeyHashMap<K, V> extends AbstractMap<K, V> impl
                 return false;
             }
             Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-            V v = ConcurrentWeakKeyHashMap.this.get(e.getKey());
+            V v = get(e.getKey());
             return v != null && v.equals(e.getValue());
         }
 
diff --git a/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java b/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
index 36722e1e9a..526c1617e2 100644
--- a/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
+++ b/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
@@ -48,6 +48,5 @@ public final class DeadLockProofWorker {
     }
 
     private DeadLockProofWorker() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java b/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
index cf9e6b3a41..cde4b68e1d 100644
--- a/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
@@ -121,6 +121,5 @@ public final class ExecutorUtil {
     }
 
     private ExecutorUtil() {
-        super();
     }
 }
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java b/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
index b7654b4b04..ae37821b8d 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
@@ -102,7 +102,7 @@ public final class JZlib {
     // Bit length codes must not exceed MAX_BL_BITS bits
     static final int MAX_BL_BITS = 7;
 
-    static enum WrapperType {
+    enum WrapperType {
         NONE, ZLIB, GZIP, ZLIB_OR_NONE
     }
 
diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
index 696e9a08ed..d44961b514 100644
--- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
@@ -203,7 +203,6 @@ public abstract class AbstractSocketServerBootstrapTest {
         final StringBuffer result = new StringBuffer();
 
         ParentChannelHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
index c4515c860b..10a17f80bb 100644
--- a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
+++ b/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
@@ -114,7 +114,6 @@ public class CompleteChannelFutureTest {
         private static final long serialVersionUID = 7059276744882005047L;
 
         ExpectedError() {
-            super();
         }
     }
 }
diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
index 91c346595a..ffef50f17d 100644
--- a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
@@ -145,7 +145,6 @@ public abstract class AbstractSocketEchoTest {
         volatile int counter;
 
         EchoHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
index 013173feb7..14ae28e96a 100644
--- a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
@@ -89,7 +89,6 @@ public class NioServerSocketShutdownTimeTest {
         volatile boolean closed;
 
         DummyHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
index 186e3d1c01..e6f5eac878 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
@@ -147,7 +147,6 @@ public abstract class AbstractSocketFixedLengthEchoTest {
         volatile int counter;
 
         EchoHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketRequestBuilder.java b/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketRequestBuilder.java
index 43cfff16db..bbb2678ef5 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketRequestBuilder.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketRequestBuilder.java
@@ -77,17 +77,17 @@ public class WebSocketRequestBuilder {
     }
     
     public WebSocketRequestBuilder version13() {
-        this.version = WebSocketVersion.V13;
+        version = WebSocketVersion.V13;
         return this;
     }
     
     public WebSocketRequestBuilder version8() {
-        this.version = WebSocketVersion.V08;
+        version = WebSocketVersion.V08;
         return this;
     }
     
     public WebSocketRequestBuilder version00() {
-        this.version = null;
+        version = null;
         return this;
     }
     
diff --git a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
index 6b8f596a9f..da934bc0c7 100644
--- a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
@@ -96,7 +96,6 @@ public class ReplayingDecoderTest {
     private static final class LineDecoder extends ReplayingDecoder<VoidEnum> {
 
         LineDecoder() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
index ca546e40ac..d721f96a81 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
@@ -155,7 +155,6 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
         volatile int counter;
 
         EchoHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
index 44a52fedb9..f0c4f60271 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
@@ -156,7 +156,6 @@ public abstract class AbstractSocketObjectStreamEchoTest {
         volatile int counter;
 
         EchoHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java
index d82803d8be..a8961aed64 100644
--- a/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/spdy/AbstractSocketSpdyEchoTest.java
@@ -259,7 +259,6 @@ public abstract class AbstractSocketSpdyEchoTest {
         final boolean server;
 
         EchoHandler(ChannelBuffer frames, boolean server) {
-            super();
             this.frames = frames;
             this.server = server;
         }
diff --git a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java
index 4af21f6417..7b90cad7c2 100644
--- a/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/spdy/SpdySessionHandlerTest.java
@@ -273,7 +273,6 @@ public class SpdySessionHandlerTest {
         private final boolean server;
 
         EchoHandler(int closeSignal, boolean server) {
-            super();
             this.closeSignal = closeSignal;
             this.server = server;
         }
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
index be93705a62..69cb161bdf 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
@@ -160,7 +160,6 @@ public abstract class AbstractSocketStringEchoTest {
         volatile int counter;
 
         EchoHandler() {
-            super();
         }
 
         @Override
diff --git a/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java b/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java
index 6980a2997a..f5b3a7f7cd 100644
--- a/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java
+++ b/src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java
@@ -87,7 +87,6 @@ public class ThreadRenamingRunnableTest {
     private static class ImmediateExecutor implements Executor {
 
         ImmediateExecutor() {
-            super();
         }
 
         public void execute(Runnable command) {