Index: api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
===================================================================
--- api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java	(revision 1514131)
+++ api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java	(working copy)
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Properties;
 
 import org.apache.logging.log4j.Logger;
Index: core/src/main/java/org/apache/logging/log4j/core/Appender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/Appender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/Appender.java	(working copy)
@@ -20,10 +20,8 @@
 
 /**
  * Appends log events.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
-public interface Appender<T extends Serializable> extends LifeCycle {
+public interface Appender extends LifeCycle {
 
     /**
      * Log in <code>Appender</code> specific way. When appropriate,
@@ -47,7 +45,7 @@
      *
      * @return the Layout for the Appender or null if none is configured.
      */
-    Layout<T> getLayout();
+    Layout<? extends Serializable> getLayout();
 
     /**
      * Some appenders need to propagate exceptions back to the application. When {@code ignoreExceptions} is
Index: core/src/main/java/org/apache/logging/log4j/core/Logger.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/Logger.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/Logger.java	(working copy)
@@ -139,7 +139,7 @@
      * This method is not exposed through the public API and is used primarily for unit testing.
      * @param appender The Appender to add to the Logger.
      */
-    public void addAppender(final Appender<?> appender) {
+    public void addAppender(final Appender appender) {
         config.config.addLoggerAppender(this, appender);
     }
 
@@ -147,7 +147,7 @@
      * This method is not exposed through the public API and is used primarily for unit testing.
      * @param appender The Appender to remove from the Logger.
      */
-    public void removeAppender(final Appender<?> appender) {
+    public void removeAppender(final Appender appender) {
         config.loggerConfig.removeAppender(appender.getName());
     }
 
@@ -155,7 +155,7 @@
      * This method is not exposed through the public API and is used primarily for unit testing.
      * @return A Map containing the Appender's name as the key and the Appender as the value.
      */
-    public Map<String, Appender<?>> getAppenders() {
+    public Map<String, Appender> getAppenders() {
          return config.loggerConfig.getAppenders();
     }
 
Index: core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java	(working copy)
@@ -31,11 +31,9 @@
 /**
  * Abstract base class for Appenders. Although Appenders do not have to extend this class, doing so
  * will simplify their implementation.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
-public abstract class AbstractAppender<T extends Serializable> extends AbstractFilterable
-    implements Appender<T> {
+public abstract class AbstractAppender extends AbstractFilterable
+    implements Appender {
     /**
      * Allow subclasses access to the status logger without creating another instance.
      */
@@ -45,7 +43,7 @@
 
     private ErrorHandler handler = new DefaultErrorHandler(this);
 
-    private final Layout<T> layout;
+    private final Layout<? extends Serializable> layout;
 
     private final String name;
 
@@ -69,7 +67,7 @@
      * @param filter The Filter to associate with the Appender.
      * @param layout The layout to use to format the event.
      */
-    protected AbstractAppender(final String name, final Filter filter, final Layout<T> layout) {
+    protected AbstractAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout) {
         this(name, filter, layout, true);
     }
 
@@ -81,7 +79,7 @@
      * @param ignoreExceptions If true, exceptions will be logged and suppressed. If false errors will be
      * logged and then passed to the application.
      */
-    protected AbstractAppender(final String name, final Filter filter, final Layout<T> layout,
+    protected AbstractAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
                                final boolean ignoreExceptions) {
         super(filter);
         this.name = name;
@@ -130,7 +128,7 @@
      * @return The Layout used to format the event.
      */
     @Override
-    public Layout<T> getLayout() {
+    public Layout<? extends Serializable> getLayout() {
         return layout;
     }
 
Index: core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java	(working copy)
@@ -27,10 +27,8 @@
 
 /**
  * Appends log events as bytes to a byte output stream. The stream encoding is defined in the layout.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
-public abstract class AbstractOutputStreamAppender<T extends Serializable> extends AbstractAppender<T> {
+public abstract class AbstractOutputStreamAppender extends AbstractAppender {
 
     /**
      * Immediate flush means that the underlying writer or output stream
@@ -57,7 +55,7 @@
      * @param layout The layout to format the message.
      * @param manager The OutputStreamManager.
      */
-    protected AbstractOutputStreamAppender(final String name, final Layout<T> layout, final Filter filter,
+    protected AbstractOutputStreamAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
                                            final boolean ignoreExceptions, final boolean immediateFlush,
                                            final OutputStreamManager manager) {
         super(name, filter, layout, ignoreExceptions);
Index: core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java	(working copy)
@@ -44,11 +44,9 @@
  * AsyncAppender with one or more Appenders and an Appender to append to if the
  * queue is full. The AsyncAppender does not allow a filter to be specified on
  * the Appender references.
- *
- * @param <T> The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Async", category = "Core", elementType = "appender", printObject = true)
-public final class AsyncAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class AsyncAppender extends AbstractAppender {
 
     private static final int DEFAULT_QUEUE_SIZE = 128;
     private static final String SHUTDOWN = "Shutdown";
@@ -59,7 +57,7 @@
     private final AppenderRef[] appenderRefs;
     private final String errorRef;
     private final boolean includeLocation;
-    private AppenderControl<?> errorAppender;
+    private AppenderControl errorAppender;
     private AsyncThread thread;
     private static final AtomicLong threadSequence = new AtomicLong(1);
 
@@ -78,10 +76,9 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void start() {
-        final Map<String, Appender<?>> map = config.getAppenders();
-        final List<AppenderControl<?>> appenders = new ArrayList<AppenderControl<?>>();
+        final Map<String, Appender> map = config.getAppenders();
+        final List<AppenderControl> appenders = new ArrayList<AppenderControl>();
         for (final AppenderRef appenderRef : appenderRefs) {
             if (map.containsKey(appenderRef.getRef())) {
                 appenders.add(new AppenderControl(map.get(appenderRef.getRef()), appenderRef.getLevel(),
@@ -168,7 +165,7 @@
      * @return The AsyncAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> AsyncAppender<S> createAppender(
+    public static AsyncAppender createAppender(
                 @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
                 @PluginAttr("errorRef") final String errorRef,
                 @PluginAttr("blocking") final String blocking,
@@ -191,7 +188,7 @@
         final boolean isIncludeLocation = Boolean.parseBoolean(includeLocation);
         final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
 
-        return new AsyncAppender<S>(name, filter, appenderRefs, errorRef,
+        return new AsyncAppender(name, filter, appenderRefs, errorRef,
                 queueSize, isBlocking, ignoreExceptions, config, isIncludeLocation);
     }
 
@@ -201,10 +198,10 @@
     private class AsyncThread extends Thread {
 
         private volatile boolean shutdown = false;
-        private final List<AppenderControl<?>> appenders;
+        private final List<AppenderControl> appenders;
         private final BlockingQueue<Serializable> queue;
 
-        public AsyncThread(final List<AppenderControl<?>> appenders, final BlockingQueue<Serializable> queue) {
+        public AsyncThread(final List<AppenderControl> appenders, final BlockingQueue<Serializable> queue) {
             this.appenders = appenders;
             this.queue = queue;
             setDaemon(true);
@@ -228,7 +225,7 @@
                 final Log4jLogEvent event = Log4jLogEvent.deserialize(s);
                 event.setEndOfBatch(queue.isEmpty());
                 boolean success = false;
-                for (final AppenderControl<?> control : appenders) {
+                for (final AppenderControl control : appenders) {
                     try {
                         control.callAppender(event);
                         success = true;
@@ -251,7 +248,7 @@
                     if (s instanceof Log4jLogEvent) {
                         final Log4jLogEvent event = Log4jLogEvent.deserialize(s);
                         event.setEndOfBatch(queue.isEmpty());
-                        for (final AppenderControl<?> control : appenders) {
+                        for (final AppenderControl control : appenders) {
                             control.callAppender(event);
                         }
                     }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java	(working copy)
@@ -44,11 +44,9 @@
  * is handled within the Layout. Typically, a Layout will generate a String
  * and then call getBytes which may use a configured encoding or the system
  * default. OTOH, a Writer cannot print byte streams.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true)
-public final class ConsoleAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class ConsoleAppender extends AbstractOutputStreamAppender {
 
     private static ConsoleManagerFactory factory = new ConsoleManagerFactory();
 
@@ -62,7 +60,7 @@
         SYSTEM_ERR
     }
 
-    private ConsoleAppender(final String name, final Layout<T> layout, final Filter filter,
+    private ConsoleAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
                             final OutputStreamManager manager,
                             final boolean ignoreExceptions) {
         super(name, layout, filter, ignoreExceptions, true, manager);
@@ -77,11 +75,10 @@
      * @param name The name of the Appender (required).
      * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
      *               they are propagated to the caller.
-     * @param <S> The {@link Layout}'s {@link Serializable} type.
      * @return The ConsoleAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> ConsoleAppender<S> createAppender(@PluginElement("Layout") Layout<S> layout,
+    public static ConsoleAppender createAppender(@PluginElement("Layout") Layout<? extends Serializable> layout,
                                                  @PluginElement("Filters") final Filter filter,
                                                  @PluginAttr("target") final String t,
                                                  @PluginAttr("name") final String name,
@@ -92,18 +89,15 @@
             return null;
         }
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
-            layout = l;
+            layout = PatternLayout.createLayout(null, null, null, null, null);
         }
         final boolean isFollow = Boolean.parseBoolean(follow);
         final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
         final Target target = t == null ? Target.SYSTEM_OUT : Target.valueOf(t);
-        return new ConsoleAppender<S>(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions);
+        return new ConsoleAppender(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions);
     }
 
-    private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout layout) {
+    private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout<? extends Serializable> layout) {
         final String type = target.name();
         final OutputStream os = getOutputStream(follow, target);
         return OutputStreamManager.getManager(target.name() + "." + follow, new FactoryData(os, type, layout), factory);
@@ -217,14 +211,14 @@
     private static class FactoryData {
         private final OutputStream os;
         private final String type;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         /**
          * Constructor.
          * @param os The OutputStream.
          * @param type The name of the target.
          */
-        public FactoryData(final OutputStream os, final String type, final Layout layout) {
+        public FactoryData(final OutputStream os, final String type, final Layout<? extends Serializable> layout) {
             this.os = os;
             this.type = type;
             this.layout = layout;
Index: core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java	(working copy)
@@ -39,11 +39,9 @@
  * The FailoverAppender will capture exceptions in an Appender and then route the event
  * to a different appender. Hopefully it is obvious that the Appenders must be configured
  * to not suppress exceptions for the FailoverAppender to work.
- *
- * @param <T> The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Failover", category = "Core", elementType = "appender", printObject = true)
-public final class FailoverAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class FailoverAppender extends AbstractAppender {
 
     private static final int DEFAULT_INTERVAL_SECONDS = 60;
 
@@ -53,9 +51,9 @@
 
     private final Configuration config;
 
-    private AppenderControl<?> primary;
+    private AppenderControl primary;
 
-    private final List<AppenderControl<?>> failoverAppenders = new ArrayList<AppenderControl<?>>();
+    private final List<AppenderControl> failoverAppenders = new ArrayList<AppenderControl>();
 
     private final long intervalMillis;
 
@@ -74,9 +72,8 @@
 
 
     @Override
-    @SuppressWarnings("unchecked")
     public void start() {
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         int errors = 0;
         if (map.containsKey(primaryRef)) {
             primary = new AppenderControl(map.get(primaryRef), null, null);
@@ -187,7 +184,7 @@
      * @return The FailoverAppender that was created.
      */
     @PluginFactory
-    public static <S extends Serializable> FailoverAppender<S> createAppender(@PluginAttr("name") final String name,
+    public static FailoverAppender createAppender(@PluginAttr("name") final String name,
                                                   @PluginAttr("primary") final String primary,
                                                   @PluginElement("Failovers") final String[] failovers,
                                                   @PluginAttr("retryInterval") final String retryIntervalString,
@@ -218,6 +215,6 @@
 
         final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
 
-        return new FailoverAppender<S>(name, filter, primary, failovers, retryIntervalMillis, config, ignoreExceptions);
+        return new FailoverAppender(name, filter, primary, failovers, retryIntervalMillis, config, ignoreExceptions);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java	(working copy)
@@ -34,17 +34,15 @@
 
 /**
  * File Appender.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "File", category = "Core", elementType = "appender", printObject = true)
-public final class FileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class FileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
     private final Advertiser advertiser;
     private Object advertisement;
 
-    private FileAppender(final String name, final Layout<T> layout, final Filter filter, final FileManager manager,
+    private FileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter, final FileManager manager,
                          final String filename, final boolean ignoreExceptions, final boolean immediateFlush,
                          final Advertiser advertiser) {
         super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
@@ -97,14 +95,14 @@
      * @return The FileAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> FileAppender<S> createAppender(@PluginAttr("fileName") final String fileName,
+    public static FileAppender createAppender(@PluginAttr("fileName") final String fileName,
                                               @PluginAttr("append") final String append,
                                               @PluginAttr("locking") final String locking,
                                               @PluginAttr("name") final String name,
                                               @PluginAttr("immediateFlush") final String immediateFlush,
                                               @PluginAttr("ignoreExceptions") final String ignore,
                                               @PluginAttr("bufferedIO") final String bufferedIO,
-                                              @PluginElement("Layout") Layout<S> layout,
+                                              @PluginElement("Layout") Layout<? extends Serializable> layout,
                                               @PluginElement("Filters") final Filter filter,
                                               @PluginAttr("advertise") final String advertise,
                                               @PluginAttr("advertiseURI") final String advertiseURI,
@@ -133,10 +131,7 @@
             return null;
         }
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
-            layout = l;
+            layout = PatternLayout.createLayout(null, null, null, null, null);
         }
 
         final FileManager manager = FileManager.getFileManager(fileName, isAppend, isLocking, isBuffered, advertiseURI,
@@ -146,7 +141,7 @@
         }
 
 
-        return new FileAppender<S>(name, layout, filter, manager, fileName, ignoreExceptions, isFlush,
+        return new FileAppender(name, layout, filter, manager, fileName, ignoreExceptions, isFlush,
                 isAdvertise ? config.getAdvertiser() : null);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java	(working copy)
@@ -22,6 +22,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.HashMap;
@@ -42,7 +43,7 @@
     private final String advertiseURI;
 
     protected FileManager(final String fileName, final OutputStream os, final boolean append, final boolean locking,
-                          final String advertiseURI, final Layout layout) {
+                          final String advertiseURI, final Layout<? extends Serializable> layout) {
         super(os, fileName, layout);
         this.isAppend = append;
         this.isLocking = locking;
@@ -61,7 +62,7 @@
      */
     public static FileManager getFileManager(final String fileName, final boolean append, boolean locking,
                                              final boolean bufferedIO, final String advertiseURI,
-                                             final Layout layout) {
+                                             final Layout<? extends Serializable> layout) {
 
         if (locking && bufferedIO) {
             locking = false;
@@ -142,7 +143,7 @@
         private final boolean locking;
         private final boolean bufferedIO;
         private final String advertiseURI;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         /**
          * Constructor.
@@ -152,7 +153,7 @@
          * @param advertiseURI the URI to use when advertising the file
          */
         public FactoryData(final boolean append, final boolean locking, final boolean bufferedIO,
-                           final String advertiseURI, final Layout layout) {
+                           final String advertiseURI, final Layout<? extends Serializable> layout) {
             this.append = append;
             this.locking = locking;
             this.bufferedIO = bufferedIO;
Index: core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/JMSQueueAppender.java	(working copy)
@@ -31,15 +31,13 @@
 
 /**
  * Appender to write to a JMS Queue.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "JMSQueue", category = "Core", elementType = "appender", printObject = true)
-public final class JMSQueueAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class JMSQueueAppender extends AbstractAppender {
 
     private final JMSQueueManager manager;
 
-    private JMSQueueAppender(final String name, final Filter filter, final Layout<T> layout,
+    private JMSQueueAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
                              final JMSQueueManager manager, final boolean ignoreExceptions) {
         super(name, filter, layout, ignoreExceptions);
         this.manager = manager;
@@ -76,11 +74,10 @@
      * @param filter The Filter or null.
      * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
      *               they are propagated to the caller.
-     * @param <S> The {@link Layout}'s {@link Serializable} type.
      * @return The JMSQueueAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> JMSQueueAppender<S> createAppender(
+    public static JMSQueueAppender createAppender(
                                                 @PluginAttr("name") final String name,
                                                 @PluginAttr("factoryName") final String factoryName,
                                                 @PluginAttr("providerURL") final String providerURL,
@@ -91,7 +88,7 @@
                                                 @PluginAttr("queueBindingName") final String queueBindingName,
                                                 @PluginAttr("userName") final String userName,
                                                 @PluginAttr("password") final String password,
-                                                @PluginElement("Layout") Layout<S> layout,
+                                                @PluginElement("Layout") Layout<? extends Serializable> layout,
                                                 @PluginElement("Filter") final Filter filter,
                                                 @PluginAttr("ignoreExceptions") final String ignore) {
         if (name == null) {
@@ -105,11 +102,8 @@
             return null;
         }
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) SerializedLayout.createLayout();
-            layout = l;
+            layout = SerializedLayout.createLayout();
         }
-        return new JMSQueueAppender<S>(name, filter, layout, manager, ignoreExceptions);
+        return new JMSQueueAppender(name, filter, layout, manager, ignoreExceptions);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/JMSTopicAppender.java	(working copy)
@@ -31,15 +31,13 @@
 
 /**
  * Appender to write to a JMS Topic.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "JMSTopic", category = "Core", elementType = "appender", printObject = true)
-public final class JMSTopicAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class JMSTopicAppender extends AbstractAppender {
 
     private final JMSTopicManager manager;
 
-    private JMSTopicAppender(final String name, final Filter filter, final Layout<T> layout,
+    private JMSTopicAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
                              final JMSTopicManager manager, final boolean ignoreExceptions) {
         super(name, filter, layout, ignoreExceptions);
         this.manager = manager;
@@ -80,7 +78,7 @@
      * @return The JMSTopicAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> JMSTopicAppender<S> createAppender(
+    public static JMSTopicAppender createAppender(
                                                 @PluginAttr("name") final String name,
                                                 @PluginAttr("factoryName") final String factoryName,
                                                 @PluginAttr("providerURL") final String providerURL,
@@ -91,7 +89,7 @@
                                                 @PluginAttr("topicBindingName") final String topicBindingName,
                                                 @PluginAttr("userName") final String userName,
                                                 @PluginAttr("password") final String password,
-                                                @PluginElement("Layout") Layout<S> layout,
+                                                @PluginElement("Layout") Layout<? extends Serializable> layout,
                                                 @PluginElement("Filters") final Filter filter,
                                                 @PluginAttr("ignoreExceptions") final String ignore) {
 
@@ -106,11 +104,8 @@
             return null;
         }
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) SerializedLayout.createLayout();
-            layout = l;
+            layout = SerializedLayout.createLayout();
         }
-        return new JMSTopicAppender<S>(name, filter, layout, manager, ignoreExceptions);
+        return new JMSTopicAppender(name, filter, layout, manager, ignoreExceptions);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java	(working copy)
@@ -32,7 +32,7 @@
     private final byte[] footer;
     private final byte[] header;
 
-    protected OutputStreamManager(final OutputStream os, final String streamName, final Layout layout) {
+    protected OutputStreamManager(final OutputStream os, final String streamName, final Layout<?> layout) {
         super(streamName);
         this.os = os;
         if (layout != null) {
Index: core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java	(working copy)
@@ -35,17 +35,15 @@
 
 /**
  * File Appender.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "RandomAccessFile", category = "Core", elementType = "appender", printObject = true)
-public final class RandomAccessFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class RandomAccessFileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
     private Object advertisement;
     private final Advertiser advertiser;
 
-    private RandomAccessFileAppender(final String name, final Layout<T> layout, final Filter filter,
+    private RandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
             final RandomAccessFileManager manager, final String filename, final boolean ignoreExceptions,
             final boolean immediateFlush, final Advertiser advertiser) {
         super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
@@ -121,13 +119,13 @@
      * @return The FileAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> RandomAccessFileAppender<S> createAppender(
+    public static RandomAccessFileAppender createAppender(
             @PluginAttr("fileName") final String fileName,
             @PluginAttr("append") final String append,
             @PluginAttr("name") final String name,
             @PluginAttr("immediateFlush") final String immediateFlush,
             @PluginAttr("ignoreExceptions") final String ignore,
-            @PluginElement("Layout") Layout<S> layout,
+            @PluginElement("Layout") Layout<? extends Serializable> layout,
             @PluginElement("Filters") final Filter filter,
             @PluginAttr("advertise") final String advertise,
             @PluginAttr("advertiseURI") final String advertiseURI,
@@ -149,10 +147,7 @@
             return null;
         }
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
-            layout = l;
+            layout = PatternLayout.createLayout(null, null, null, null, null);
         }
         final RandomAccessFileManager manager = RandomAccessFileManager.getFileManager(
                 fileName, isAppend, isFlush, advertiseURI, layout
@@ -161,7 +156,7 @@
             return null;
         }
 
-        return new RandomAccessFileAppender<S>(
+        return new RandomAccessFileAppender(
                 name, layout, filter, manager, fileName, ignoreExceptions, isFlush,
                 isAdvertise ? config.getAdvertiser() : null
         );
Index: core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java	(working copy)
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
+import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,7 +46,7 @@
     protected RandomAccessFileManager(final RandomAccessFile file,
             final String fileName, final OutputStream os,
             final boolean immediateFlush, final String advertiseURI,
-            final Layout layout) {
+            final Layout<? extends Serializable> layout) {
         super(os, fileName, layout);
         this.isImmediateFlush = immediateFlush;
         this.randomAccessFile = file;
@@ -70,7 +71,7 @@
      */
     public static RandomAccessFileManager getFileManager(final String fileName,
             final boolean append, final boolean isFlush,
-            final String advertiseURI, final Layout layout) {
+            final String advertiseURI, final Layout<? extends Serializable> layout) {
         return (RandomAccessFileManager) getManager(fileName, new FactoryData(append,
                 isFlush, advertiseURI, layout), FACTORY);
     }
@@ -168,7 +169,7 @@
         private final boolean append;
         private final boolean immediateFlush;
         private final String advertiseURI;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         /**
          * Constructor.
@@ -176,7 +177,7 @@
          * @param append Append status.
          */
         public FactoryData(final boolean append, final boolean immediateFlush,
-                final String advertiseURI, final Layout layout) {
+                final String advertiseURI, final Layout<? extends Serializable> layout) {
             this.append = append;
             this.immediateFlush = immediateFlush;
             this.advertiseURI = advertiseURI;
Index: core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java	(working copy)
@@ -39,11 +39,9 @@
 
 /**
  * An appender that writes to files and can roll over at intervals.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "RollingFile", category = "Core", elementType = "appender", printObject = true)
-public final class RollingFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class RollingFileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
     private final String filePattern;
@@ -51,7 +49,7 @@
     private final Advertiser advertiser;
 
 
-    private RollingFileAppender(final String name, final Layout<T> layout, final Filter filter,
+    private RollingFileAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
                                 final RollingFileManager manager, final String fileName,
                                 final String filePattern, final boolean ignoreExceptions, final boolean immediateFlush,
                                 final Advertiser advertiser) {
@@ -124,7 +122,7 @@
      * @return A RollingFileAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> RollingFileAppender<S> createAppender(
+    public static <S extends Serializable> RollingFileAppender createAppender(
                                               @PluginAttr("fileName") final String fileName,
                                               @PluginAttr("filePattern") final String filePattern,
                                               @PluginAttr("append") final String append,
@@ -133,7 +131,7 @@
                                               @PluginAttr("immediateFlush") final String immediateFlush,
                                               @PluginElement("Policy") final TriggeringPolicy policy,
                                               @PluginElement("Strategy") RolloverStrategy strategy,
-                                              @PluginElement("Layout") Layout<S> layout,
+                                              @PluginElement("Layout") Layout<? extends Serializable> layout,
                                               @PluginElement("Filter") final Filter filter,
                                               @PluginAttr("ignoreExceptions") final String ignore,
                                               @PluginAttr("advertise") final String advertise,
@@ -170,10 +168,7 @@
         }
 
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
-            layout = l;
+            layout = PatternLayout.createLayout(null, null, null, null, null);
         }
 
         final RollingFileManager manager = RollingFileManager.getFileManager(fileName, filePattern, isAppend,
@@ -182,7 +177,7 @@
             return null;
         }
 
-        return new RollingFileAppender<S>(name, layout, filter, manager, fileName, filePattern,
+        return new RollingFileAppender(name, layout, filter, manager, fileName, filePattern,
                 ignoreExceptions, isFlush, isAdvertise ? config.getAdvertiser() : null);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java	(working copy)
@@ -41,18 +41,16 @@
 /**
  * An appender that writes to random access files and can roll over at
  * intervals.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = "appender", printObject = true)
-public final class RollingRandomAccessFileAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender {
 
     private final String fileName;
     private final String filePattern;
     private Object advertisement;
     private final Advertiser advertiser;
 
-    private RollingRandomAccessFileAppender(final String name, final Layout<T> layout,
+    private RollingRandomAccessFileAppender(final String name, final Layout<? extends Serializable> layout,
             final Filter filter, final RollingFileManager manager, final String fileName,
             final String filePattern, final boolean ignoreExceptions,
             final boolean immediateFlush, final Advertiser advertiser) {
@@ -143,7 +141,7 @@
      * @return A RollingRandomAccessFileAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> RollingRandomAccessFileAppender<S> createAppender(
+    public static <S extends Serializable> RollingRandomAccessFileAppender createAppender(
             @PluginAttr("fileName") final String fileName,
             @PluginAttr("filePattern") final String filePattern,
             @PluginAttr("append") final String append,
@@ -151,7 +149,7 @@
             @PluginAttr("immediateFlush") final String immediateFlush,
             @PluginElement("Policy") final TriggeringPolicy policy,
             @PluginElement("Strategy") RolloverStrategy strategy,
-            @PluginElement("Layout") Layout<S> layout,
+            @PluginElement("Layout") Layout<? extends Serializable> layout,
             @PluginElement("Filter") final Filter filter,
             @PluginAttr("ignoreExceptions") final String ignore,
             @PluginAttr("advertise") final String advertise,
@@ -191,10 +189,7 @@
         }
 
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) PatternLayout.createLayout(null, null, null, null, null);
-            layout = l;
+            layout = PatternLayout.createLayout(null, null, null, null, null);
         }
 
 
@@ -204,7 +199,7 @@
             return null;
         }
 
-        return new RollingRandomAccessFileAppender<S>(name, layout, filter, manager,
+        return new RollingRandomAccessFileAppender(name, layout, filter, manager,
                 fileName, filePattern, ignoreExceptions, isFlush,
                 isAdvertise ? config.getAdvertiser() : null);
     }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java	(working copy)
@@ -48,18 +48,16 @@
  * By default, an email message will be sent when an ERROR or higher severity
  * message is appended. This can be modified by setting a filter for the
  * appender.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "SMTP", category = "Core", elementType = "appender", printObject = true)
-public final class SMTPAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class SMTPAppender extends AbstractAppender {
 
     private static final int DEFAULT_BUFFER_SIZE = 512;
 
     /** The SMTP Manager */
     protected final SMTPManager manager;
 
-    private SMTPAppender(final String name, final Filter filter, final Layout<T> layout, final SMTPManager manager,
+    private SMTPAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, final SMTPManager manager,
                          final boolean ignoreExceptions) {
         super(name, filter, layout, ignoreExceptions);
         this.manager = manager;
@@ -106,7 +104,7 @@
      * @return The SMTPAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> SMTPAppender<S> createAppender(@PluginAttr("name") final String name,
+    public static SMTPAppender createAppender(@PluginAttr("name") final String name,
                                               @PluginAttr("to") final String to,
                                               @PluginAttr("cc") final String cc,
                                               @PluginAttr("bcc") final String bcc,
@@ -120,7 +118,7 @@
                                               @PluginAttr("smtpPassword") final String smtpPassword,
                                               @PluginAttr("smtpDebug") final String smtpDebug,
                                               @PluginAttr("bufferSize") final String bufferSizeNum,
-                                              @PluginElement("Layout") Layout<S> layout,
+                                              @PluginElement("Layout") Layout<? extends Serializable> layout,
                                               @PluginElement("Filter") Filter filter,
                                               @PluginAttr("ignoreExceptions") final String ignore) {
         if (name == null) {
@@ -134,10 +132,7 @@
         final int bufferSize = bufferSizeNum == null ? DEFAULT_BUFFER_SIZE : Integer.valueOf(bufferSizeNum);
 
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) HTMLLayout.createLayout(null, null, null, null, null, null);
-            layout = l;
+            layout = HTMLLayout.createLayout(null, null, null, null, null, null);
         }
         if (filter == null) {
             filter = ThresholdFilter.createFilter(null, null, null);
@@ -149,7 +144,7 @@
             return null;
         }
 
-        return new SMTPAppender<S>(name, filter, layout, manager, ignoreExceptions);
+        return new SMTPAppender(name, filter, layout, manager, ignoreExceptions);
     }
 
     /**
Index: core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java	(working copy)
@@ -39,15 +39,13 @@
 
 /**
  * An Appender that delivers events over socket connections. Supports both TCP and UDP.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Socket", category = "Core", elementType = "appender", printObject = true)
-public class SocketAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public class SocketAppender extends AbstractOutputStreamAppender {
     private Object advertisement;
     private final Advertiser advertiser;
 
-    protected SocketAppender(final String name, final Layout<T> layout, final Filter filter,
+    protected SocketAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
                              final AbstractSocketManager manager, final boolean ignoreExceptions,
                              final boolean immediateFlush, final Advertiser advertiser) {
         super(name, layout, filter, ignoreExceptions, immediateFlush, manager);
@@ -88,7 +86,7 @@
      * @return A SocketAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> SocketAppender<S> createAppender(@PluginAttr("host") final String host,
+    public static <S extends Serializable> SocketAppender createAppender(@PluginAttr("host") final String host,
                                                 @PluginAttr("port") final String portNum,
                                                 @PluginAttr("protocol") final String protocol,
                                                 @PluginAttr("reconnectionDelay") final String delay,
@@ -96,7 +94,7 @@
                                                 @PluginAttr("name") final String name,
                                                 @PluginAttr("immediateFlush") final String immediateFlush,
                                                 @PluginAttr("ignoreExceptions") final String ignore,
-                                                @PluginElement("Layout") Layout<S> layout,
+                                                @PluginElement("Layout") Layout<? extends Serializable> layout,
                                                 @PluginElement("Filters") final Filter filter,
                                                 @PluginAttr("advertise") final String advertise,
                                                 @PluginConfiguration final Configuration config) {
@@ -108,10 +106,7 @@
         final int reconnectDelay = AbstractAppender.parseInt(delay, 0);
         final int port = AbstractAppender.parseInt(portNum, 0);
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-            final
-            Layout<S> l = (Layout<S>) SerializedLayout.createLayout();
-            layout = l;
+            layout = SerializedLayout.createLayout();
         }
 
         if (name == null) {
@@ -129,13 +124,13 @@
             return null;
         }
 
-        return new SocketAppender<S>(name, layout, filter, manager, ignoreExceptions, isFlush,
+        return new SocketAppender(name, layout, filter, manager, ignoreExceptions, isFlush,
                 isAdvertise ? config.getAdvertiser() : null);
     }
 
     protected static AbstractSocketManager createSocketManager(final Protocol p, final String host, final int port,
                                                                final int delay, final boolean immediateFail,
-                                                               final Layout layout) {
+                                                               final Layout<? extends Serializable> layout) {
         switch (p) {
             case TCP:
                 return TCPSocketManager.getSocketManager(host, port, delay, immediateFail, layout);
Index: core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java	(working copy)
@@ -37,15 +37,13 @@
 
 /**
  * The Syslog Appender.
- *
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Syslog", category = "Core", elementType = "appender", printObject = true)
-public class SyslogAppender<T extends Serializable> extends SocketAppender<T> {
+public class SyslogAppender extends SocketAppender {
 
     private static final String RFC5424 = "RFC5424";
 
-    protected SyslogAppender(final String name, final Layout<T> layout, final Filter filter,
+    protected SyslogAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
                              final boolean ignoreExceptions, final boolean immediateFlush,
                              final AbstractSocketManager manager, final Advertiser advertiser) {
         super(name, layout, filter, manager, ignoreExceptions, immediateFlush, advertiser);
@@ -90,7 +88,7 @@
      * @return A SyslogAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> SyslogAppender<S> createAppender(@PluginAttr("host") final String host,
+    public static <S extends Serializable> SyslogAppender createAppender(@PluginAttr("host") final String host,
                                                 @PluginAttr("port") final String portNum,
                                                 @PluginAttr("protocol") final String protocol,
                                                 @PluginAttr("reconnectionDelay") final String delay,
@@ -126,8 +124,7 @@
         final boolean fail = Booleans.parseBoolean(immediateFail, true);
         final int port = AbstractAppender.parseInt(portNum, 0);
         final boolean isAdvertise = Boolean.parseBoolean(advertise);
-        @SuppressWarnings("unchecked")
-        final Layout<S> layout = (Layout<S>) (RFC5424.equalsIgnoreCase(format) ?
+        final Layout<? extends Serializable> layout = (RFC5424.equalsIgnoreCase(format) ?
             RFC5424Layout.createLayout(facility, id, ein, includeMDC, mdcId, mdcPrefix, eventPrefix, includeNL,
                 escapeNL, appName, msgId, excludes, includes, required, exceptionPattern, loggerFields, config) :
             SyslogLayout.createLayout(facility, includeNL, escapeNL, charsetName));
@@ -142,7 +139,7 @@
             return null;
         }
 
-        return new SyslogAppender<S>(name, layout, filter, ignoreExceptions, isFlush, manager,
+        return new SyslogAppender(name, layout, filter, ignoreExceptions, isFlush, manager,
                 isAdvertise ? config.getAdvertiser() : null);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java	(working copy)
@@ -35,7 +35,7 @@
  *
  * @param <T> Specifies which type of {@link AbstractDatabaseManager} this Appender requires.
  */
-public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager> extends AbstractAppender<LogEvent> {
+public abstract class AbstractDatabaseAppender<T extends AbstractDatabaseManager> extends AbstractAppender {
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final Lock readLock = lock.readLock();
     private final Lock writeLock = lock.writeLock();
Index: core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java	(working copy)
@@ -41,7 +41,7 @@
  * @param <T> The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Rewrite", category = "Core", elementType = "appender", printObject = true)
-public final class RewriteAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class RewriteAppender extends AbstractAppender {
     private final Configuration config;
     private final ConcurrentMap<String, AppenderControl> appenders = new ConcurrentHashMap<String, AppenderControl>();
     private final RewritePolicy rewritePolicy;
@@ -57,15 +57,14 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void start() {
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         for (final AppenderRef ref : appenderRefs) {
             final String name = ref.getRef();
             final Appender appender = map.get(name);
             if (appender != null) {
-                final Filter filter = appender instanceof AbstractAppender<?> ?
-                    ((AbstractAppender<?>) appender).getFilter() : null;
+                final Filter filter = appender instanceof AbstractAppender ?
+                    ((AbstractAppender) appender).getFilter() : null;
                 appenders.put(name, new AppenderControl(appender, ref.getLevel(), filter));
             } else {
                 LOGGER.error("Appender " + ref + " cannot be located. Reference ignored");
@@ -106,7 +105,7 @@
      * @return The created RewriteAppender.
      */
     @PluginFactory
-    public static <S extends Serializable> RewriteAppender<S> createAppender(@PluginAttr("name") final String name,
+    public static RewriteAppender createAppender(@PluginAttr("name") final String name,
                                           @PluginAttr("ignoreExceptions") final String ignore,
                                           @PluginElement("AppenderRef") final AppenderRef[] appenderRefs,
                                           @PluginConfiguration final Configuration config,
@@ -122,6 +121,6 @@
             LOGGER.error("No appender references defined for RewriteAppender");
             return null;
         }
-        return new RewriteAppender<S>(name, filter, ignoreExceptions, appenderRefs, rewritePolicy, config);
+        return new RewriteAppender(name, filter, ignoreExceptions, appenderRefs, rewritePolicy, config);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java	(working copy)
@@ -22,6 +22,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.util.concurrent.Semaphore;
 
 import org.apache.logging.log4j.core.Layout;
@@ -47,7 +48,7 @@
 
     protected RollingFileManager(final String fileName, final String pattern, final OutputStream os,
                                  final boolean append, final long size, final long time, final TriggeringPolicy policy,
-                                 final RolloverStrategy strategy, final String advertiseURI, final Layout layout) {
+                                 final RolloverStrategy strategy, final String advertiseURI, final Layout<? extends Serializable> layout) {
         super(fileName, os, append, false, advertiseURI, layout);
         this.size = size;
         this.initialTime = time;
@@ -72,7 +73,7 @@
     public static RollingFileManager getFileManager(final String fileName, final String pattern, final boolean append,
                                                     final boolean bufferedIO, final TriggeringPolicy policy,
                                                     final RolloverStrategy strategy, final String advertiseURI,
-                                                    final Layout layout) {
+                                                    final Layout<? extends Serializable> layout) {
 
         return (RollingFileManager) getManager(fileName, new FactoryData(pattern, append,
             bufferedIO, policy, strategy, advertiseURI, layout), factory);
@@ -237,7 +238,7 @@
         private final TriggeringPolicy policy;
         private final RolloverStrategy strategy;
         private final String advertiseURI;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         /**
          * Create the data for the factory.
@@ -249,7 +250,7 @@
          */
         public FactoryData(final String pattern, final boolean append, final boolean bufferedIO,
                            final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
-                           final Layout layout) {
+                           final Layout<? extends Serializable> layout) {
             this.pattern = pattern;
             this.append = append;
             this.bufferedIO = bufferedIO;
Index: core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java	(working copy)
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
+import java.io.Serializable;
 import java.nio.ByteBuffer;
 
 import org.apache.logging.log4j.core.Layout;
@@ -45,7 +46,7 @@
             final String pattern, final OutputStream os, final boolean append,
             final boolean immediateFlush, final long size, final long time,
             final TriggeringPolicy policy, final RolloverStrategy strategy,
-            final String advertiseURI, final Layout layout) {
+            final String advertiseURI, final Layout<? extends Serializable> layout) {
         super(fileName, pattern, os, append, size, time, policy, strategy, advertiseURI, layout);
         this.isImmediateFlush = immediateFlush;
         this.randomAccessFile = raf;
@@ -57,7 +58,7 @@
 
     public static RollingRandomAccessFileManager getRollingRandomAccessFileManager(final String fileName, final String filePattern,
             final boolean isAppend, final boolean immediateFlush, final TriggeringPolicy policy,
-            final RolloverStrategy strategy, final String advertiseURI, final Layout layout) {
+            final RolloverStrategy strategy, final String advertiseURI, final Layout<? extends Serializable> layout) {
         return (RollingRandomAccessFileManager) getManager(fileName, new FactoryData(filePattern, isAppend, immediateFlush,
             policy, strategy, advertiseURI, layout), FACTORY);
     }
@@ -185,7 +186,7 @@
         private final TriggeringPolicy policy;
         private final RolloverStrategy strategy;
         private final String advertiseURI;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         /**
          * Create the data for the factory.
@@ -196,7 +197,7 @@
          */
         public FactoryData(final String pattern, final boolean append, final boolean immediateFlush,
                            final TriggeringPolicy policy, final RolloverStrategy strategy, final String advertiseURI,
-                           final Layout layout) {
+                           final Layout<? extends Serializable> layout) {
             this.pattern = pattern;
             this.append = append;
             this.immediateFlush = immediateFlush;
Index: core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java	(working copy)
@@ -43,17 +43,15 @@
  * the Routing appender declaration. The pattern should contain one or more substitution patterns of
  * the form "$${[key:]token}". The pattern will be resolved each time the Appender is called using
  * the built in StrSubstitutor and the StrLookup plugin that matches the specified key.
- *
- * @param <T> The {@link org.apache.logging.log4j.core.Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Routing", category = "Core", elementType = "appender", printObject = true)
-public final class RoutingAppender<T extends Serializable> extends AbstractAppender<T> {
+public final class RoutingAppender extends AbstractAppender {
     private static final String DEFAULT_KEY = "ROUTING_APPENDER_DEFAULT";
     private final Routes routes;
     private final Route defaultRoute;
     private final Configuration config;
-    private final ConcurrentMap<String, AppenderControl<T>> appenders =
-            new ConcurrentHashMap<String, AppenderControl<T>>();
+    private final ConcurrentMap<String, AppenderControl> appenders =
+            new ConcurrentHashMap<String, AppenderControl>();
     private final RewritePolicy rewritePolicy;
 
     private RoutingAppender(final String name, final Filter filter, final boolean ignoreExceptions, final Routes routes,
@@ -76,13 +74,12 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void start() {
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         // Register all the static routes.
         for (final Route route : routes.getRoutes()) {
             if (route.getAppenderRef() != null) {
-                final Appender<?> appender = map.get(route.getAppenderRef());
+                final Appender appender = map.get(route.getAppenderRef());
                 if (appender != null) {
                     final String key = route == defaultRoute ? DEFAULT_KEY : route.getKey();
                     appenders.put(key, new AppenderControl(appender, null, null));
@@ -97,8 +94,8 @@
     @Override
     public void stop() {
         super.stop();
-        final Map<String, Appender<?>> map = config.getAppenders();
-        for (final Map.Entry<String, AppenderControl<T>> entry : appenders.entrySet()) {
+        final Map<String, Appender> map = config.getAppenders();
+        for (final Map.Entry<String, AppenderControl> entry : appenders.entrySet()) {
             final String name = entry.getValue().getAppender().getName();
             if (!map.containsKey(name)) {
                 entry.getValue().getAppender().stop();
@@ -112,14 +109,14 @@
             event = rewritePolicy.rewrite(event);
         }
         final String key = config.getSubst().replace(event, routes.getPattern());
-        final AppenderControl<T> control = getControl(key, event);
+        final AppenderControl control = getControl(key, event);
         if (control != null) {
             control.callAppender(event);
         }
     }
 
-    private synchronized AppenderControl<T> getControl(final String key, final LogEvent event) {
-        AppenderControl<T> control = appenders.get(key);
+    private synchronized AppenderControl getControl(final String key, final LogEvent event) {
+        AppenderControl control = appenders.get(key);
         if (control != null) {
             return control;
         }
@@ -138,26 +135,25 @@
             }
         }
         if (route != null) {
-            final Appender<T> app = createAppender(route, event);
+            final Appender app = createAppender(route, event);
             if (app == null) {
                 return null;
             }
-            control = new AppenderControl<T>(app, null, null);
+            control = new AppenderControl(app, null, null);
             appenders.put(key, control);
         }
 
         return control;
     }
 
-    private Appender<T> createAppender(final Route route, final LogEvent event) {
+    private Appender createAppender(final Route route, final LogEvent event) {
         final Node routeNode = route.getNode();
         for (final Node node : routeNode.getChildren()) {
             if (node.getType().getElementName().equals("appender")) {
                 final Node appNode = new Node(node);
                 config.createConfiguration(appNode, event);
                 if (appNode.getObject() instanceof Appender) {
-                    @SuppressWarnings("unchecked")
-                    final Appender<T> app = (Appender<T>) appNode.getObject();
+                    final Appender app = (Appender) appNode.getObject();
                     app.start();
                     return app;
                 }
@@ -182,7 +178,7 @@
      * @return The RoutingAppender
      */
     @PluginFactory
-    public static <S extends Serializable> RoutingAppender<S> createAppender(@PluginAttr("name") final String name,
+    public static RoutingAppender createAppender(@PluginAttr("name") final String name,
                                           @PluginAttr("ignoreExceptions") final String ignore,
                                           @PluginElement("Routes") final Routes routes,
                                           @PluginConfiguration final Configuration config,
@@ -198,6 +194,6 @@
             LOGGER.error("No routes defined for RoutingAppender");
             return null;
         }
-        return new RoutingAppender<S>(name, filter, ignoreExceptions, routes, rewritePolicy, config);
+        return new RoutingAppender(name, filter, ignoreExceptions, routes, rewritePolicy, config);
     }
 }
Index: core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java	(working copy)
@@ -16,8 +16,6 @@
  */
 package org.apache.logging.log4j.core.config;
 
-import java.io.Serializable;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.Filter;
@@ -28,13 +26,12 @@
 
 /**
  * Wraps an {@link Appender} with details an appender implementation shouldn't need to know about.
- * @param <T> The appender's Serializable type.
  */
-public class AppenderControl<T extends Serializable> extends AbstractFilterable {
+public class AppenderControl extends AbstractFilterable {
 
-    private final ThreadLocal<AppenderControl<T>> recursive = new ThreadLocal<AppenderControl<T>>();
+    private final ThreadLocal<AppenderControl> recursive = new ThreadLocal<AppenderControl>();
 
-    private final Appender<T> appender;
+    private final Appender appender;
 
     private final Level level;
 
@@ -46,7 +43,7 @@
      * @param level the Level to filter on.
      * @param filter the Filter(s) to apply.
      */
-    public AppenderControl(final Appender<T> appender, final Level level, final Filter filter) {
+    public AppenderControl(final Appender appender, final Level level, final Filter filter) {
         super(filter);
         this.appender = appender;
         this.level = level;
@@ -58,7 +55,7 @@
      * Returns the Appender.
      * @return the Appender.
      */
-    public Appender<T> getAppender() {
+    public Appender getAppender() {
         return appender;
     }
 
Index: core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java	(working copy)
@@ -93,7 +93,7 @@
 
     private String name;
 
-    private ConcurrentMap<String, Appender<?>> appenders = new ConcurrentHashMap<String, Appender<?>>();
+    private ConcurrentMap<String, Appender> appenders = new ConcurrentHashMap<String, Appender>();
 
     private ConcurrentMap<String, LoggerConfig> loggers = new ConcurrentHashMap<String, LoggerConfig>();
 
@@ -205,7 +205,7 @@
                 subst.setVariableResolver(new Interpolator(lookup));
             }
             if (child.getName().equalsIgnoreCase("appenders")) {
-                appenders = (ConcurrentMap<String, Appender<?>>) child.getObject();
+                appenders = (ConcurrentMap<String, Appender>) child.getObject();
             } else if (child.getObject() instanceof Filter) {
                 addFilter((Filter) child.getObject());
             } else if (child.getName().equalsIgnoreCase("loggers")) {
@@ -253,7 +253,7 @@
         final Layout<? extends Serializable> layout =
                 PatternLayout.createLayout("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n",
                         null, null, null, null);
-        final Appender<?> appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false",
+        final Appender appender = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false",
             "true");
         appender.start();
         addAppender(appender);
@@ -314,7 +314,7 @@
      * @param name The name of the Appender.
      * @return the Appender with the specified name or null if the Appender cannot be located.
      */
-    public Appender<?> getAppender(final String name) {
+    public Appender getAppender(final String name) {
         return appenders.get(name);
     }
 
@@ -323,7 +323,7 @@
      * @return A Map containing each Appender's name and the Appender object.
      */
     @Override
-    public Map<String, Appender<?>> getAppenders() {
+    public Map<String, Appender> getAppenders() {
         return appenders;
     }
 
@@ -371,7 +371,7 @@
      */
     @Override
     public synchronized void addLoggerAppender(final org.apache.logging.log4j.core.Logger logger,
-                                               final Appender<?> appender) {
+                                               final Appender appender) {
         final String name = logger.getName();
         appenders.putIfAbsent(appender.getName(), appender);
         final LoggerConfig lc = getLoggerConfig(name);
@@ -534,7 +534,7 @@
 
     @Override
     public void createConfiguration(final Node node, final LogEvent event) {
-        final PluginType type = node.getType();
+        final PluginType<?> type = node.getType();
         if (type != null && type.isDeferChildren()) {
             node.setObject(createPluginObject(type, node, event));
         } else {
@@ -567,9 +567,9 @@
     * @return the instantiate method or null if there is none by that
     * description.
     */
-    private Object createPluginObject(final PluginType type, final Node node, final LogEvent event)
+    private <T> Object createPluginObject(final PluginType<T> type, final Node node, final LogEvent event)
     {
-        final Class clazz = type.getPluginClass();
+        final Class<T> clazz = type.getPluginClass();
 
         if (Map.class.isAssignableFrom(clazz)) {
             try {
@@ -612,7 +612,7 @@
         }
 
         final Annotation[][] parmArray = factoryMethod.getParameterAnnotations();
-        final Class[] parmClasses = factoryMethod.getParameterTypes();
+        final Class<?>[] parmClasses = factoryMethod.getParameterTypes();
         if (parmArray.length != parmClasses.length) {
             LOGGER.error("Number of parameter annotations does not equal the number of paramters");
         }
@@ -674,7 +674,7 @@
                         sb.append(name).append("={");
                         boolean first = true;
                         for (final Node child : children) {
-                            final PluginType childType = child.getType();
+                            final PluginType<?> childType = child.getType();
                             if (elem.value().equalsIgnoreCase(childType.getElementName()) ||
                                 parmClass.isAssignableFrom(childType.getPluginClass())) {
                                 used.add(child);
@@ -718,7 +718,7 @@
                         final Class<?> parmClass = parmClasses[index];
                         boolean present = false;
                         for (final Node child : children) {
-                            final PluginType childType = child.getType();
+                            final PluginType<?> childType = child.getType();
                             if (elem.value().equals(childType.getElementName()) ||
                                 parmClass.isAssignableFrom(childType.getPluginClass())) {
                                 sb.append(child.getName()).append("(").append(child.toString()).append(")");
Index: core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java	(working copy)
@@ -52,11 +52,11 @@
      * Returns a Map containing all the Appenders and their name.
      * @return A Map containing each Appender's name and the Appender object.
      */
-    Map<String, Appender<?>> getAppenders();
+    Map<String, Appender> getAppenders();
 
     Map<String, LoggerConfig> getLoggers();
 
-    void addLoggerAppender(Logger logger, Appender<?> appender);
+    void addLoggerAppender(Logger logger, Appender appender);
 
     void addLoggerFilter(Logger logger, Filter filter);
 
Index: core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java	(working copy)
@@ -107,9 +107,9 @@
                     }
                     final PluginManager manager = new PluginManager("ConfigurationFactory");
                     manager.collectPlugins();
-                    final Map<String, PluginType> plugins = manager.getPlugins();
+                    final Map<String, PluginType<?>> plugins = manager.getPlugins();
                     final Set<WeightedFactory> ordered = new TreeSet<WeightedFactory>();
-                    for (final PluginType type : plugins.values()) {
+                    for (final PluginType<?> type : plugins.values()) {
                         try {
                             @SuppressWarnings("unchecked")
                             final Class<ConfigurationFactory> clazz = (Class<ConfigurationFactory>)type.getPluginClass();
Index: core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java	(working copy)
@@ -50,7 +50,7 @@
         setName(DEFAULT_NAME);
         final Layout<? extends Serializable> layout =
                 PatternLayout.createLayout("%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n", null, null, null, null);
-        final Appender<? extends Serializable> appender =
+        final Appender appender =
                 ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
         appender.start();
         addAppender(appender);
Index: core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/JSONConfiguration.java	(working copy)
@@ -132,7 +132,7 @@
                     if (advertiserString != null)
                     {
                         @SuppressWarnings("unchecked")
-                        final PluginType<Advertiser> type = getPluginManager().getPluginType(advertiserString);
+                        final PluginType<Advertiser> type = (PluginType<Advertiser>) getPluginManager().getPluginType(advertiserString);
                         if (type != null)
                         {
                             final Class<Advertiser> clazz = type.getPluginClass();
Index: core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java	(working copy)
@@ -16,18 +16,6 @@
  */
 package org.apache.logging.log4j.core.config;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,6 +42,17 @@
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.PropertiesUtil;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Logger object that is created via configuration.
  */
@@ -66,7 +65,7 @@
     private static LogEventFactory LOG_EVENT_FACTORY = null;
 
     private List<AppenderRef> appenderRefs = new ArrayList<AppenderRef>();
-    private final Map<String, AppenderControl<?>> appenders = new ConcurrentHashMap<String, AppenderControl<?>>();
+    private final Map<String, AppenderControl> appenders = new ConcurrentHashMap<String, AppenderControl>();
     private final String name;
     private LogEventFactory logEventFactory;
     private Level level;
@@ -186,9 +185,9 @@
      * @param level The Level to use.
      * @param filter A Filter for the Appender reference.
      */
-    public <T extends Serializable> void addAppender(final Appender<T> appender, final Level level,
+    public void addAppender(final Appender appender, final Level level,
             final Filter filter) {
-        appenders.put(appender.getName(), new AppenderControl<T>(appender, level,
+        appenders.put(appender.getName(), new AppenderControl(appender, level,
                 filter));
     }
 
@@ -210,9 +209,9 @@
      * @return a Map with the Appender name as the key and the Appender as the
      *         value.
      */
-    public Map<String, Appender<?>> getAppenders() {
-        final Map<String, Appender<?>> map = new HashMap<String, Appender<?>>();
-        for (final Map.Entry<String, AppenderControl<?>> entry : appenders
+    public Map<String, Appender> getAppenders() {
+        final Map<String, Appender> map = new HashMap<String, Appender>();
+        for (final Map.Entry<String, AppenderControl> entry : appenders
                 .entrySet()) {
             map.put(entry.getKey(), entry.getValue().getAppender());
         }
@@ -224,10 +223,10 @@
      */
     protected void clearAppenders() {
         waitForCompletion();
-        final Collection<AppenderControl<?>> controls = appenders.values();
-        final Iterator<AppenderControl<?>> iterator = controls.iterator();
+        final Collection<AppenderControl> controls = appenders.values();
+        final Iterator<AppenderControl> iterator = controls.iterator();
         while (iterator.hasNext()) {
-            final AppenderControl<?> ctl = iterator.next();
+            final AppenderControl ctl = iterator.next();
             iterator.remove();
             cleanupFilter(ctl);
         }
Index: core/src/main/java/org/apache/logging/log4j/core/config/Node.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/Node.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/Node.java	(working copy)
@@ -31,7 +31,7 @@
     private final Node parent;
     private final String name;
     private String value;
-    private final PluginType type;
+    private final PluginType<?> type;
     private final Map<String, String> attributes = new HashMap<String, String>();
     private final List<Node> children = new ArrayList<Node>();
     private Object object;
@@ -45,7 +45,7 @@
      * @param name the node's name.
      * @param type The Plugin Type associated with the node.
      */
-    public Node(final Node parent, final String name, final PluginType type) {
+    public Node(final Node parent, final String name, final PluginType<?> type) {
         this.parent = parent;
         this.name = name;
         this.type = type;
@@ -109,7 +109,7 @@
         return object;
     }
 
-    public PluginType getType() {
+    public PluginType<?> getType() {
         return type;
     }
 
Index: core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java	(working copy)
@@ -205,7 +205,7 @@
                     if (advertiserString != null)
                     {
                         @SuppressWarnings("unchecked")
-                        final PluginType<Advertiser> type = getPluginManager().getPluginType(advertiserString);
+                        final PluginType<Advertiser> type = (PluginType<Advertiser>) getPluginManager().getPluginType(advertiserString);
                         if (type != null)
                         {
                             final Class<Advertiser> clazz = type.getPluginClass();
Index: core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java	(working copy)
@@ -16,12 +16,11 @@
  */
 package org.apache.logging.log4j.core.config.plugins;
 
-import java.io.Serializable;
+import org.apache.logging.log4j.core.Appender;
+
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.logging.log4j.core.Appender;
-
 /**
  * An Appender container.
  */
@@ -37,12 +36,13 @@
      * @return The Appender Map.
      */
     @PluginFactory
-    public static ConcurrentMap<String, Appender<? extends Serializable>> createAppenders(
-                                             @PluginElement("Appenders") final Appender<?>[] appenders) {
-        final ConcurrentMap<String, Appender<? extends Serializable>> map =
-            new ConcurrentHashMap<String, Appender<? extends Serializable>>();
+    public static ConcurrentMap<String, Appender> createAppenders(
+                @PluginElement("Appenders") final Appender[] appenders) {
 
-        for (final Appender<?> appender : appenders) {
+        final ConcurrentMap<String, Appender> map =
+            new ConcurrentHashMap<String, Appender>();
+
+        for (final Appender appender : appenders) {
                 map.put(appender.getName(), appender);
         }
 
Index: core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginManager.java	(working copy)
@@ -44,8 +44,8 @@
 
     private static final long NANOS_PER_SECOND = 1000000000L;
 
-    private static ConcurrentMap<String, ConcurrentMap<String, PluginType>> pluginTypeMap =
-        new ConcurrentHashMap<String, ConcurrentMap<String, PluginType>>();
+    private static ConcurrentMap<String, ConcurrentMap<String, PluginType<?>>> pluginTypeMap =
+        new ConcurrentHashMap<String, ConcurrentMap<String, PluginType<?>>>();
 
     private static final CopyOnWriteArrayList<String> PACKAGES = new CopyOnWriteArrayList<String>();
     private static final String PATH = "org/apache/logging/log4j/core/config/plugins/";
@@ -56,7 +56,7 @@
 
     private static String rootDir;
 
-    private Map<String, PluginType> plugins = new HashMap<String, PluginType>();
+    private Map<String, PluginType<?>> plugins = new HashMap<String, PluginType<?>>();
     private final String type;
     private final Class<?> clazz;
 
@@ -110,7 +110,7 @@
      * @param name The name of the plugin.
      * @return The plugin's type.
      */
-    public PluginType getPluginType(final String name) {
+    public PluginType<?> getPluginType(final String name) {
         return plugins.get(name.toLowerCase());
     }
 
@@ -118,7 +118,7 @@
      * Returns all the matching plugins.
      * @return A Map containing the name of the plugin and its type.
      */
-    public Map<String, PluginType> getPlugins() {
+    public Map<String, PluginType<?>> getPlugins() {
         return plugins;
     }
 
@@ -135,7 +135,7 @@
      * @param pkgs A comma separated list of package names to scan for plugins. If
      * null the default Log4j package name will be used.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public void collectPlugins(boolean preLoad, final String pkgs) {
         if (pluginTypeMap.containsKey(type)) {
             plugins = pluginTypeMap.get(type);
@@ -148,7 +148,7 @@
             resolver.setClassLoader(classLoader);
         }
         if (preLoad) {
-            final ConcurrentMap<String, ConcurrentMap<String, PluginType>> map = decode(classLoader);
+            final ConcurrentMap<String, ConcurrentMap<String, PluginType<?>>> map = decode(classLoader);
             if (map != null) {
                 pluginTypeMap = map;
                 plugins = map.get(type);
@@ -176,9 +176,9 @@
             final Plugin plugin = clazz.getAnnotation(Plugin.class);
             final String pluginType = plugin.category();
             if (!pluginTypeMap.containsKey(pluginType)) {
-                pluginTypeMap.putIfAbsent(pluginType, new ConcurrentHashMap<String, PluginType>());
+                pluginTypeMap.putIfAbsent(pluginType, new ConcurrentHashMap<String, PluginType<?>>());
             }
-            final Map<String, PluginType> map = pluginTypeMap.get(pluginType);
+            final Map<String, PluginType<?>> map = pluginTypeMap.get(pluginType);
             final String type = plugin.elementType().equals(Plugin.EMPTY) ? plugin.name() : plugin.elementType();
             map.put(plugin.name().toLowerCase(), new PluginType(clazz, type, plugin.printObject(),
                 plugin.deferChildren()));
@@ -196,8 +196,8 @@
         LOGGER.debug(sb.toString());
     }
 
-    @SuppressWarnings("unchecked")
-    private static ConcurrentMap<String, ConcurrentMap<String, PluginType>> decode(final ClassLoader classLoader) {
+    @SuppressWarnings({ "unchecked" })
+    private static ConcurrentMap<String, ConcurrentMap<String, PluginType<?>>> decode(final ClassLoader classLoader) {
         Enumeration<URL> resources;
         try {
             resources = classLoader.getResources(PATH + FILENAME);
@@ -205,8 +205,8 @@
             LOGGER.warn("Unable to preload plugins", ioe);
             return null;
         }
-        final ConcurrentMap<String, ConcurrentMap<String, PluginType>> map =
-            new ConcurrentHashMap<String, ConcurrentMap<String, PluginType>>();
+        final ConcurrentMap<String, ConcurrentMap<String, PluginType<?>>> map =
+            new ConcurrentHashMap<String, ConcurrentMap<String, PluginType<?>>>();
         while (resources.hasMoreElements()) {
             DataInputStream dis = null;
             try {
@@ -219,9 +219,9 @@
                 for (int j = 0; j < count; ++j) {
                     final String type = dis.readUTF();
                     final int entries = dis.readInt();
-                    ConcurrentMap<String, PluginType> types = map.get(type);
+                    ConcurrentMap<String, PluginType<?>> types = map.get(type);
                     if (types == null) {
-                        types = new ConcurrentHashMap<String, PluginType>(count);
+                        types = new ConcurrentHashMap<String, PluginType<?>>(count);
                     }
                     for (int i = 0; i < entries; ++i) {
                         final String key = dis.readUTF();
@@ -248,7 +248,7 @@
         return map.size() == 0 ? null : map;
     }
 
-    private static void encode(final ConcurrentMap<String, ConcurrentMap<String, PluginType>> map) {
+    private static void encode(final ConcurrentMap<String, ConcurrentMap<String, PluginType<?>>> map) {
         final String fileName = rootDir + PATH + FILENAME;
         DataOutputStream dos = null;
         try {
@@ -258,12 +258,12 @@
             final BufferedOutputStream bos = new BufferedOutputStream(fos);
             dos = new DataOutputStream(bos);
             dos.writeInt(map.size());
-            for (final Map.Entry<String, ConcurrentMap<String, PluginType>> outer : map.entrySet()) {
+            for (final Map.Entry<String, ConcurrentMap<String, PluginType<?>>> outer : map.entrySet()) {
                 dos.writeUTF(outer.getKey());
                 dos.writeInt(outer.getValue().size());
-                for (final Map.Entry<String, PluginType> entry : outer.getValue().entrySet()) {
+                for (final Map.Entry<String, PluginType<?>> entry : outer.getValue().entrySet()) {
                     dos.writeUTF(entry.getKey());
-                    final PluginType pt = entry.getValue();
+                    final PluginType<?> pt = entry.getValue();
                     dos.writeUTF(pt.getPluginClass().getName());
                     dos.writeUTF(pt.getElementName());
                     dos.writeBoolean(pt.isObjectPrintable());
Index: core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java	(working copy)
@@ -27,7 +27,7 @@
 public class AppenderAdmin implements AppenderAdminMBean {
 
     private final String contextName;
-    private final Appender<?> appender;
+    private final Appender appender;
     private final ObjectName objectName;
 
     /**
@@ -37,7 +37,7 @@
      * @param contextName used in the {@code ObjectName} for this mbean
      * @param appender the instrumented object
      */
-    public AppenderAdmin(final String contextName, final Appender<?> appender) {
+    public AppenderAdmin(final String contextName, final Appender appender) {
         // super(executor); // no notifications for now
         this.contextName = Assert.isNotNull(contextName, "contextName");
         this.appender = Assert.isNotNull(appender, "appender");
Index: core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java	(working copy)
@@ -240,9 +240,9 @@
             InstanceAlreadyExistsException, MBeanRegistrationException,
             NotCompliantMBeanException {
 
-        final Map<String, Appender<?>> map = ctx.getConfiguration().getAppenders();
+        final Map<String, Appender> map = ctx.getConfiguration().getAppenders();
         for (final String name : map.keySet()) {
-            final Appender<?> appender = map.get(name);
+            final Appender appender = map.get(name);
             final AppenderAdmin mbean = new AppenderAdmin(ctx.getName(), appender);
             mbs.registerMBean(mbean, mbean.getObjectName());
         }
Index: core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java	(working copy)
@@ -43,11 +43,11 @@
         this.defaultLookup = defaultLookup == null ? new MapLookup(new HashMap<String, String>()) : defaultLookup;
         final PluginManager manager = new PluginManager("Lookup");
         manager.collectPlugins();
-        final Map<String, PluginType> plugins = manager.getPlugins();
+        final Map<String, PluginType<?>> plugins = manager.getPlugins();
 
-        for (final Map.Entry<String, PluginType> entry : plugins.entrySet()) {
+        for (final Map.Entry<String, PluginType<?>> entry : plugins.entrySet()) {
             @SuppressWarnings("unchecked")
-            final Class<StrLookup> clazz = entry.getValue().getPluginClass();
+            final Class<? extends StrLookup> clazz = (Class<? extends StrLookup>) entry.getValue().getPluginClass();
             try {
                 lookups.put(entry.getKey(), clazz.newInstance());
             } catch (final Exception ex) {
Index: core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java	(working copy)
@@ -16,14 +16,15 @@
  */
 package org.apache.logging.log4j.core.net;
 
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.OutputStreamManager;
+
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.appender.OutputStreamManager;
-
 /**
  * Abstract base class for managing sockets.
  */
@@ -51,7 +52,7 @@
      * @param port The target port number.
      */
     public AbstractSocketManager(final String name, final OutputStream os, final InetAddress addr, final String host,
-                                 final int port, final Layout layout) {
+                                 final int port, final Layout<? extends Serializable> layout) {
         super(os, name, layout);
         this.address = addr;
         this.host = host;
Index: core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java	(working copy)
@@ -16,16 +16,17 @@
  */
 package org.apache.logging.log4j.core.net;
 
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.ManagerFactory;
+import org.apache.logging.log4j.core.helpers.Strings;
+
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.appender.ManagerFactory;
-import org.apache.logging.log4j.core.helpers.Strings;
-
 /**
  * Socket Manager for UDP connections.
  */
@@ -43,7 +44,7 @@
      * @param layout The layout
      */
     protected DatagramSocketManager(final String name, final OutputStream os, final InetAddress address, final String host,
-                                    final int port, final Layout layout) {
+                                    final int port, final Layout<? extends Serializable> layout) {
         super(name, os, address, host, port, layout);
     }
 
@@ -54,7 +55,7 @@
      * @param layout The layout.
      * @return A DatagramSocketManager.
      */
-    public static DatagramSocketManager getSocketManager(final String host, final int port, final Layout layout) {
+    public static DatagramSocketManager getSocketManager(final String host, final int port, final Layout<? extends Serializable> layout) {
         if (Strings.isEmpty(host)) {
             throw new IllegalArgumentException("A host name is required");
         }
@@ -87,9 +88,9 @@
     private static class FactoryData {
         private final String host;
         private final int port;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
-        public FactoryData(final String host, final int port, final Layout layout) {
+        public FactoryData(final String host, final int port, final Layout<? extends Serializable> layout) {
             this.host = host;
             this.port = port;
             this.layout = layout;
Index: core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/net/MulticastDNSAdvertiser.java	(working copy)
@@ -167,7 +167,7 @@
         //version 1 uses a hashtable
         final Hashtable<String, String> hashtableProperties = new Hashtable<String, String>(properties);
         try {
-            final Class[] args = new Class[6];
+            final Class<?>[] args = new Class<?>[6];
             args[0] = String.class;
             args[1] = String.class;
             args[2] = int.class;
@@ -197,7 +197,7 @@
 
     private Object buildServiceInfoVersion3(final String zone, final int port, final String name, final Map<String, String> properties) {
         try {
-            final Class[] args = new Class[6];
+            final Class<?>[] args = new Class<?>[6];
             args[0] = String.class; //zone/type
             args[1] = String.class; //display name
             args[2] = int.class; //port
Index: core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java	(working copy)
@@ -16,9 +16,16 @@
  */
 package org.apache.logging.log4j.core.net;
 
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.AppenderLoggingException;
+import org.apache.logging.log4j.core.appender.ManagerFactory;
+import org.apache.logging.log4j.core.appender.OutputStreamManager;
+import org.apache.logging.log4j.core.helpers.Strings;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Serializable;
 import java.net.ConnectException;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -27,12 +34,6 @@
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.appender.AppenderLoggingException;
-import org.apache.logging.log4j.core.appender.ManagerFactory;
-import org.apache.logging.log4j.core.appender.OutputStreamManager;
-import org.apache.logging.log4j.core.helpers.Strings;
-
 /**
  * Manager of TCP Socket connections.
  */
@@ -72,7 +73,7 @@
      */
     public TCPSocketManager(final String name, final OutputStream os, final Socket sock, final InetAddress addr,
                             final String host, final int port, final int delay, final boolean immediateFail,
-                            final Layout layout) {
+                            final Layout<? extends Serializable> layout) {
         super(name, os, addr, host, port, layout);
         this.reconnectionDelay = delay;
         this.socket = sock;
@@ -94,7 +95,7 @@
      * @return A TCPSocketManager.
      */
     public static TCPSocketManager getSocketManager(final String host, int port, int delay,
-                                                    final boolean immediateFail, final Layout layout ) {
+                                                    final boolean immediateFail, final Layout<? extends Serializable> layout ) {
         if (Strings.isEmpty(host)) {
             throw new IllegalArgumentException("A host name is required");
         }
@@ -228,10 +229,10 @@
         private final int port;
         private final int delay;
         private final boolean immediateFail;
-        private final Layout layout;
+        private final Layout<? extends Serializable> layout;
 
         public FactoryData(final String host, final int port, final int delay, final boolean immediateFail,
-                           final Layout layout) {
+                           final Layout<? extends Serializable> layout) {
             this.host = host;
             this.port = port;
             this.delay = delay;
Index: core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java
===================================================================
--- core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java	(revision 1514131)
+++ core/src/main/java/org/apache/logging/log4j/core/pattern/PatternParser.java	(working copy)
@@ -114,10 +114,10 @@
         this.config = config;
         final PluginManager manager = new PluginManager(converterKey, expectedClass);
         manager.collectPlugins();
-        final Map<String, PluginType> plugins = manager.getPlugins();
+        final Map<String, PluginType<?>> plugins = manager.getPlugins();
         final Map<String, Class<PatternConverter>> converters = new HashMap<String, Class<PatternConverter>>();
 
-        for (final PluginType type : plugins.values()) {
+        for (final PluginType<?> type : plugins.values()) {
             try {
                 @SuppressWarnings("unchecked")
                 final Class<PatternConverter> clazz = (Class<PatternConverter>)type.getPluginClass();
Index: core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java
===================================================================
--- core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/dumbster/smtp/SimpleSmtpServer.java	(working copy)
@@ -229,7 +229,7 @@
      *
      * @return List of String
      */
-    public synchronized Iterator getReceivedEmail() {
+    public synchronized Iterator<SmtpMessage> getReceivedEmail() {
         return receivedMail.iterator();
     }
 
Index: core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java
===================================================================
--- core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/dumbster/smtp/SmtpMessage.java	(working copy)
@@ -70,8 +70,8 @@
      *
      * @return an Iterator over the set of header names (String)
      */
-    public Iterator getHeaderNames() {
-        final Set nameSet = headers.keySet();
+    public Iterator<String> getHeaderNames() {
+        final Set<String> nameSet = headers.keySet();
         return nameSet.iterator();
     }
 
Index: core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/ReflectionComparison.java	(working copy)
@@ -22,6 +22,7 @@
 import org.apache.logging.log4j.message.StringFormattedMessage;
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import sun.reflect.Reflection;
 
 import java.lang.reflect.Constructor;
@@ -39,13 +40,13 @@
 
     private static final int COUNT = 1000000;
 
-    private static Class[] paramTypes = new Class[] {String.class, Object[].class};
+    private static Class<?>[] paramTypes = new Class<?>[] {String.class, Object[].class};
 
     @BeforeClass
     public static void setupCallerCheck() {
         try {
             final ClassLoader loader = Loader.getClassLoader();
-            final Class clazz = loader.loadClass("sun.reflect.Reflection");
+            final Class<?> clazz = loader.loadClass("sun.reflect.Reflection");
             final Method[] methods = clazz.getMethods();
             for (final Method method : methods) {
                 final int modifier = method.getModifiers();
@@ -109,11 +110,11 @@
         System.out.println(timer.toString());
     }
 
-    private Class getCallerClass(final Object[] array) {
+    private Class<?> getCallerClass(final Object[] array) {
         if (getCallerClass != null) {
             try {
                 /*Object[] params = new Object[]{index}; */
-                return (Class) getCallerClass.invoke(null, array);
+                return (Class<?>) getCallerClass.invoke(null, array);
             } catch (final Exception ex) {
                 fail(ex.getMessage());
                 // logger.debug("Unable to determine caller class via Sun Reflection", ex);
Index: core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java	(working copy)
@@ -40,21 +40,20 @@
 
     private static final String CONFIG = "log4j-reference-level.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app1;
-    private static ListAppender<LogEvent> app2;
+    private static ListAppender app1;
+    private static ListAppender app2;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("LIST1")) {
-                app1 = (ListAppender<LogEvent>) entry.getValue();
+                app1 = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("LIST2")) {
-                app2 = (ListAppender<LogEvent>) entry.getValue();
+                app2 = (ListAppender) entry.getValue();
             }
         }
     }
Index: core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java	(working copy)
@@ -60,7 +60,7 @@
     @Before
     public void before() {
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
                 app = (ListAppender) entry.getValue();
                 break;
Index: core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java	(working copy)
@@ -47,19 +47,18 @@
 
     private static final String CONFIG = "log4j2-config.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(Constants.LOG4J_LOG_EVENT_FACTORY, TestLogEventFactory.class.getName());
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java	(working copy)
@@ -49,9 +49,9 @@
 
     private static final String CONFIG = "log4j-test2.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
-    private static ListAppender<String> host;
-    private static ListAppender<String> noThrown;
+    private static ListAppender app;
+    private static ListAppender host;
+    private static ListAppender noThrown;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -68,16 +68,15 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("HostTest")) {
-                host = (ListAppender<String>) entry.getValue();
+                host = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("NoThrowable")) {
-                noThrown = (ListAppender<String>) entry.getValue();
+                noThrown = (ListAppender) entry.getValue();
             }
         }
         assertNotNull("No Appender", app);
Index: core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java	(working copy)
@@ -40,9 +40,9 @@
 
     private static final String CONFIG = "log4j-test2.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
-    private static ListAppender<String> host;
-    private static ListAppender<String> noThrown;
+    private static ListAppender app;
+    private static ListAppender host;
+    private static ListAppender noThrown;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -59,16 +59,15 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("HostTest")) {
-                host = (ListAppender<String>) entry.getValue();
+                host = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("NoThrowable")) {
-                noThrown = (ListAppender<String>) entry.getValue();
+                noThrown = (ListAppender) entry.getValue();
             }
         }
         assertNotNull("No Appender", app);
Index: core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java	(working copy)
@@ -35,7 +35,7 @@
 
     private static final String CONFIG = "log4j-test3.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -52,7 +52,6 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
     }
Index: core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java	(working copy)
@@ -43,18 +43,17 @@
 
     private static final String CONFIG = "log4j-strict1.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 assertNotNull(app);
                 break;
             }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderNoLocationTest.java	(working copy)
@@ -41,18 +41,17 @@
 public class AsyncAppenderNoLocationTest {
     private static final String CONFIG = "log4j-asynch-no-location.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java	(working copy)
@@ -41,18 +41,17 @@
 public class AsyncAppenderTest {
     private static final String CONFIG = "log4j-asynch.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java	(working copy)
@@ -52,7 +52,7 @@
     public void testFollow() {
         final PrintStream ps = System.out;
         final Layout<String> layout = PatternLayout.createLayout(null, null, null, null, null);
-        final ConsoleAppender<String> app = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true", "false");
+        final ConsoleAppender app = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "true", "false");
         app.start();
         final LogEvent event = new Log4jLogEvent("TestLogger", null, ConsoleAppenderTest.class.getName(), Level.INFO,
             new SimpleMessage("Test"), null);
Index: core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/FailoverAppenderTest.java	(working copy)
@@ -41,19 +41,18 @@
 public class FailoverAppenderTest {
     private static final String CONFIG = "log4j-failover.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
-    private static FailOnceAppender<LogEvent> foApp;
+    private static ListAppender app;
+    private static FailOnceAppender foApp;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("Once")) {
                 foApp = (FailOnceAppender) entry.getValue();
             }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java	(working copy)
@@ -138,7 +138,7 @@
 
     private static void writer(final boolean lock, final int count, final String name) throws Exception {
         final Layout<String> layout = PatternLayout.createLayout(PatternLayout.SIMPLE_CONVERSION_PATTERN, null, null, null, null);
-        final FileAppender<String> app = FileAppender.createAppender(FILENAME, "true", Boolean.toString(lock), "test", "false",
+        final FileAppender app = FileAppender.createAppender(FILENAME, "true", Boolean.toString(lock), "test", "false",
             "false", "false", layout, null, "false", null, null);
         final Thread t = Thread.currentThread();
         app.start();
Index: core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java	(working copy)
@@ -38,7 +38,7 @@
     @Test
     public void testAppender() {
         final Layout<String> layout = PatternLayout.createLayout(null, null, null, null, null);
-        final InMemoryAppender<String> app = new InMemoryAppender<String>("test", layout, null, false);
+        final InMemoryAppender app = new InMemoryAppender("test", layout, null, false);
         final LogEvent event = new Log4jLogEvent("TestLogger", null, OutputStreamAppenderTest.class.getName(), Level.INFO,
             new SimpleMessage("Test"), null);
         app.start();
Index: core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/SMTPAppenderTest.java	(working copy)
@@ -149,7 +149,7 @@
 
         server.stop();
         assertTrue(server.getReceivedEmailSize() == 1);
-        final SmtpMessage email = (SmtpMessage) server.getReceivedEmail().next();
+        final SmtpMessage email = server.getReceivedEmail().next();
 
         assertEquals("to@example.com", email.getHeaderValue("To"));
         assertEquals("cc@example.com", email.getHeaderValue("Cc"));
Index: core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java	(working copy)
@@ -85,9 +85,9 @@
 
     @After
     public void teardown() {
-        final Map<String,Appender<?>> map = root.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String,Appender> map = root.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             root.removeAppender(app);
             app.stop();
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTest.java	(working copy)
@@ -84,9 +84,9 @@
 
     @After
     public void teardown() {
-        final Map<String,Appender<?>> map = root.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String,Appender> map = root.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             root.removeAppender(app);
             app.stop();
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java	(working copy)
@@ -75,8 +75,8 @@
     public void tearDown() throws SQLException {
         final LoggerContext context = (LoggerContext) LogManager.getContext(false);
         try {
-            final Map<String, Appender<?>> list = context.getConfiguration().getAppenders();
-            final Appender<?> appender = list.get("databaseAppender");
+            final Map<String, Appender> list = context.getConfiguration().getAppenders();
+            final Appender appender = list.get("databaseAppender");
             assertNotNull("The appender should not be null.", appender);
             assertTrue("The appender should be a JDBCAppender.", appender instanceof JDBCAppender);
             ((JDBCAppender) appender).getManager().release();
Index: core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java	(working copy)
@@ -60,8 +60,8 @@
     public void tearDown() throws SQLException {
         final LoggerContext context = (LoggerContext) LogManager.getContext(false);
         try {
-            final Map<String, Appender<?>> list = context.getConfiguration().getAppenders();
-            final Appender<?> appender = list.get("databaseAppender");
+            final Map<String, Appender> list = context.getConfiguration().getAppenders();
+            final Appender appender = list.get("databaseAppender");
             assertNotNull("The appender should not be null.", appender);
             assertTrue("The appender should be a JPAAppender.", appender instanceof JPAAppender);
             ((JPAAppender) appender).getManager().release();
Index: core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppenderTest.java	(working copy)
@@ -47,21 +47,20 @@
 public class RewriteAppenderTest {
     private static final String CONFIG = "log4j-rewrite.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
-    private static ListAppender<String> app2;
+    private static ListAppender app;
+    private static ListAppender app2;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             } else if (entry.getKey().equals("List2")) {
-                app2 = (ListAppender<String>) entry.getValue();
+                app2 = (ListAppender) entry.getValue();
             }
         }
     }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java	(working copy)
@@ -43,18 +43,17 @@
 public class JSONRoutingAppender2Test {
     private static final String CONFIG = "log4j-routing2.json";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java	(working copy)
@@ -43,18 +43,17 @@
 public class JSONRoutingAppenderTest {
     private static final String CONFIG = "log4j-routing.json";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderTest.java	(working copy)
@@ -43,18 +43,17 @@
 public class RoutingAppenderTest {
     private static final String CONFIG = "log4j-routing.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithJndiTest.java	(working copy)
@@ -16,20 +16,9 @@
  */
 package org.apache.logging.log4j.core.appender.routing;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.util.Map;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 import org.apache.logging.log4j.EventLogger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.XMLConfigurationFactory;
@@ -43,6 +32,16 @@
 import org.junit.Test;
 import org.mockejb.jndi.MockContextFactory;
 
+import java.io.File;
+import java.util.Map;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * RoutingAppenderWithJndiTest
  */
@@ -50,22 +49,21 @@
 
     private static final String CONFIG = "log4j-routing-by-jndi.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> listAppender1;
-    private static ListAppender<LogEvent> listAppender2;
+    private static ListAppender listAppender1;
+    private static ListAppender listAppender2;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List1")) {
-                listAppender1 = (ListAppender<LogEvent>) entry.getValue();
+                listAppender1 = (ListAppender) entry.getValue();
             }
             if (entry.getKey().equals("List2")) {
-                listAppender2 = (ListAppender<LogEvent>) entry.getValue();
+                listAppender2 = (ListAppender) entry.getValue();
             }
         }
     }
Index: core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingDefaultAppenderTest.java	(working copy)
@@ -43,18 +43,17 @@
 public class RoutingDefaultAppenderTest {
     private static final String CONFIG = "log4j-routing3.xml";
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/config/BaseConfigurationTest.java	(working copy)
@@ -41,7 +41,7 @@
 //        final String MISSINGROOT = "MissingRootTest";
 //        assertTrue("Incorrect Configuration. Expected " + MISSINGROOT + " but found " + config.getName(),
 //                MISSINGROOT.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("Appenders not null", map);
         assertEquals("Appenders Size", 2, map.size());
         assertTrue("Contains List", map.containsKey("List"));
@@ -54,14 +54,14 @@
         assertTrue("contains key=sample", loggerMap.containsKey("sample"));
 
         final LoggerConfig sample = loggerMap.get("sample");
-        final Map<String, Appender<?>> sampleAppenders = sample.getAppenders();
+        final Map<String, Appender> sampleAppenders = sample.getAppenders();
         assertEquals("sampleAppenders Size", 1, sampleAppenders.size());
         // sample only has List appender, not Console!
         assertTrue("sample has appender List", sampleAppenders.containsKey("List"));
 
         final BaseConfiguration baseConfig = (BaseConfiguration) config;
         final LoggerConfig root = baseConfig.getRootLogger();
-        final Map<String, Appender<?>> rootAppenders = root.getAppenders();
+        final Map<String, Appender> rootAppenders = root.getAppenders();
         assertEquals("rootAppenders Size", 1, rootAppenders.size());
         // root only has Console appender!
         assertTrue("root has appender Console", rootAppenders.containsKey("Console"));
Index: core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java	(working copy)
@@ -24,19 +24,19 @@
 import org.apache.logging.log4j.core.Layout;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.filter.CompositeFilter;
-
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.util.Map;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -73,7 +73,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
         Configurator.shutdown(ctx);
@@ -93,7 +93,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
         Configurator.shutdown(ctx);
@@ -113,7 +113,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
         Configurator.shutdown(ctx);
@@ -130,7 +130,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
         Configurator.shutdown(ctx);
@@ -147,7 +147,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
         Configurator.shutdown(ctx);
@@ -166,7 +166,7 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
         assertTrue("Wrong configuration", map.containsKey("List"));
 
@@ -192,17 +192,17 @@
         assertNotNull("No configuration", config);
         assertTrue("Incorrect Configuration. Expected " + CONFIG_NAME + " but found " + config.getName(),
             CONFIG_NAME.equals(config.getName()));
-        final Map<String, Appender<?>> map = config.getAppenders();
+        final Map<String, Appender> map = config.getAppenders();
         assertNotNull("No Appenders", map != null && map.size() > 0);
-        Appender<?> app = null;
-        for (final Map.Entry<String, Appender<?>> entry: map.entrySet()) {
+        Appender app = null;
+        for (final Map.Entry<String, Appender> entry: map.entrySet()) {
             if (entry.getKey().equals("List2")) {
                 app = entry.getValue();
                 break;
             }
         }
         assertNotNull("No ListAppender named List2", app);
-        final Layout layout = app.getLayout();
+        final Layout<? extends Serializable> layout = app.getLayout();
         assertNotNull("Appender List2 does not have a Layout", layout);
         assertTrue("Appender List2 is not configured with a PatternLayout", layout instanceof PatternLayout);
         final String pattern = ((PatternLayout) layout).getConversionPattern();
Index: core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/config/XMLConfigurationTest.java	(working copy)
@@ -131,9 +131,9 @@
     public void testConfiguredAppenders() {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext();
         final Configuration c = ctx.getConfiguration();
-        final Map<String, Appender<?>> apps = c.getAppenders();
+        final Map<String, Appender> apps = c.getAppenders();
         assertNotNull(apps);
-        assertEquals(3, apps.size());
+        assertEquals(apps.size(), 3);
     }
 
     @Test
@@ -147,10 +147,10 @@
         final Iterator<Filter> iter = l.getFilters();
         final Filter filter = iter.next();
         assertTrue(filter instanceof ThreadContextMapFilter);
-        final Map<String, Appender<?>> appenders = l.getAppenders();
+        final Map<String, Appender> appenders = l.getAppenders();
         assertNotNull(appenders);
         assertTrue("number of appenders = " + appenders.size(), appenders.size() == 1);
-        final Appender<?> a = appenders.get("STDOUT");
+        final Appender a = appenders.get("STDOUT");
         assertNotNull(a);
         assertEquals(a.getName(), "STDOUT");
     }
Index: core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/config/XMLLoggerPropsTest.java	(working copy)
@@ -39,19 +39,18 @@
 
     private static final String CONFIG = "log4j-loggerprops.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         System.setProperty("test", "test");
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java	(working copy)
@@ -40,19 +40,18 @@
     private static final String CONFIG = "log4j-burst.xml";
 
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static BurstFilter filter;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("ListAppender")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 filter = (BurstFilter) app.getFilter();
                 break;
             }
Index: core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java	(working copy)
@@ -96,11 +96,10 @@
         final Map<String, String> eventMap = new HashMap<String, String>();
         eventMap.put("eventId", "Login");
         logger.debug(new MapMessage(eventMap));
-        final Map<String,Appender<?>> appenders = config.getAppenders();
+        final Map<String,Appender> appenders = config.getAppenders();
         final Appender app = appenders.get("LIST");
         assertNotNull("No List appender", app);
-        @SuppressWarnings("unchecked")
-        final List<String> msgs = ((ListAppender<String>) app).getMessages();
+        final List<String> msgs = ((ListAppender) app).getMessages();
         assertNotNull("No messages", msgs);
         assertTrue("No messages", msgs.size() > 0);
 
Index: core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/layout/HTMLLayoutTest.java	(working copy)
@@ -87,7 +87,7 @@
 
         // set up appender
         final HTMLLayout layout = HTMLLayout.createLayout("true", null, null, null, "small", null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
         appender.start();
 
         // set appender on root and set level to debug
Index: core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java	(working copy)
@@ -83,7 +83,7 @@
         // set up appender
         final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext",
             null, null, "true", null, "ATM", null, "key1, key2, locale", null, "loginId", null, null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
 
         appender.start();
 
@@ -147,7 +147,7 @@
         // set up layout/appender
         final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext",
             null, null, "true", "#012", "ATM", null, "key1, key2, locale", null, "loginId", null, null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
 
         appender.start();
 
@@ -210,7 +210,7 @@
         // set up layout/appender
         final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext",
             null, null, "true", null, "ATM", null, "key1, key2, locale", null, "loginId", "%xEx", null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
         appender.start();
 
         // set appender on root and set level to debug
@@ -254,7 +254,7 @@
         // set up layout/appender
         final AbstractStringLayout layout = RFC5424Layout.createLayout("Local0", "Event", "3692", "true", "RequestContext",
             null, null, "true", null, "ATM", null, "key1, key2, locale", null, null, null, loggerFields, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
         appender.start();
 
         // set appender on root and set level to debug
Index: core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/layout/SerializedLayoutTest.java	(working copy)
@@ -78,7 +78,7 @@
 
         // set up appender
         final SerializedLayout layout = SerializedLayout.createLayout();
-        final ListAppender<LogEvent> appender = new ListAppender<LogEvent>("List", null, layout, false, true);
+        final ListAppender appender = new ListAppender("List", null, layout, false, true);
         appender.start();
 
         // set appender on root and set level to debug
Index: core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java	(working copy)
@@ -78,7 +78,7 @@
         // set up appender
         final SyslogLayout layout = SyslogLayout.createLayout("Local0", "true", null, null);
         //ConsoleAppender appender = new ConsoleAppender("Console", layout);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
         appender.start();
 
         // set appender on root and set level to debug
Index: core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/layout/XMLLayoutTest.java	(working copy)
@@ -78,7 +78,7 @@
 
         // set up appender
         final XMLLayout layout = XMLLayout.createLayout("true", "true", "true", null, null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, true, false);
+        final ListAppender appender = new ListAppender("List", null, layout, true, false);
         appender.start();
 
         // set appender on root and set level to debug
Index: core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java	(working copy)
@@ -16,12 +16,6 @@
  */
 package org.apache.logging.log4j.core.net;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Appender;
@@ -38,8 +32,14 @@
 import org.junit.After;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  *
  */
@@ -76,9 +76,9 @@
 
     @After
     public void tearDown() {
-        final Map<String, Appender<?>> map = root.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String, Appender> map = root.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             root.removeAppender(app);
             app.stop();
         }
@@ -106,13 +106,13 @@
     protected void testServer(final String message1, final String message2) throws Exception {
         final Filter socketFilter = new ThreadFilter(Filter.Result.NEUTRAL, Filter.Result.DENY);
         final Filter serverFilter = new ThreadFilter(Filter.Result.DENY, Filter.Result.NEUTRAL);
-        final SocketAppender<Serializable> appender = SocketAppender.createAppender("localhost", this.port, this.protocol, "-1", null, "Test", null,
+        final SocketAppender appender = SocketAppender.createAppender("localhost", this.port, this.protocol, "-1", null, "Test", null,
                 "false", null, socketFilter, null, null);
         appender.start();
-        final ListAppender<LogEvent> listApp = new ListAppender<LogEvent>("Events", serverFilter, null, false, false);
+        final ListAppender listApp = new ListAppender("Events", serverFilter, null, false, false);
         listApp.start();
         final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null);
-        final ConsoleAppender<String> console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
+        final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
         final Logger serverLogger = ctx.getLogger(this.getClass().getName());
         serverLogger.addAppender(console);
         serverLogger.setAdditive(false);
Index: core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueAppenderTest.java	(working copy)
@@ -78,7 +78,7 @@
     public void testConfiguration() throws Exception {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext();
         final Configuration config = ctx.getConfiguration();
-        final Map<String, Appender<?>> appenders = config.getAppenders();
+        final Map<String, Appender> appenders = config.getAppenders();
         assertTrue(appenders.containsKey("JMSQueue"));
     }
 }
Index: core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueFailoverTest.java	(working copy)
@@ -58,7 +58,7 @@
     private static final String CONFIG = "log4j-jmsqueue-failover.xml";
 
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -76,12 +76,11 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/JMSQueueTest.java	(working copy)
@@ -83,9 +83,9 @@
 
     @After
     public void teardown() {
-        final Map<String,Appender<?>> map = root.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String,Appender> map = root.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             root.removeAppender(app);
             app.stop();
         }
@@ -100,7 +100,7 @@
                 QUEUE_NAME, null, null, null, clientFilters, "true");
         appender.start();
         final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
-        final ListAppender<LogEvent> listApp = new ListAppender<LogEvent>("Events", serverFilters, null, false, false);
+        final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
         listApp.start();
         final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null);
         final ConsoleAppender console = ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
Index: core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicFailoverTest.java	(working copy)
@@ -57,7 +57,7 @@
     private static final String CONFIG = "log4j-jmstopic-failover.xml";
 
     private static Configuration config;
-    private static ListAppender<LogEvent> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -75,12 +75,11 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<LogEvent>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/net/JMSTopicTest.java	(working copy)
@@ -25,28 +25,26 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
 import org.apache.logging.log4j.core.appender.JMSTopicAppender;
-import org.apache.logging.log4j.test.appender.ListAppender;
+import org.apache.logging.log4j.core.filter.AbstractFilter;
 import org.apache.logging.log4j.core.filter.CompositeFilter;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.status.StatusConsoleListener;
 import org.apache.logging.log4j.status.StatusLogger;
-
+import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-
 import org.mockejb.jms.MockTopic;
 import org.mockejb.jms.TopicConnectionFactoryImpl;
 import org.mockejb.jndi.MockContextFactory;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -84,9 +82,9 @@
 
     @After
     public void teardown() {
-        final Map<String,Appender<?>> map = root.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String,Appender> map = root.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             root.removeAppender(app);
             app.stop();
         }
@@ -101,10 +99,10 @@
                 TOPIC_NAME, null, null, null, clientFilters, "true");
         appender.start();
         final CompositeFilter serverFilters = CompositeFilter.createFilters(new Filter[]{serverFilter});
-        final ListAppender<Serializable> listApp = new ListAppender<Serializable>("Events", serverFilters, null, false, false);
+        final ListAppender listApp = new ListAppender("Events", serverFilters, null, false, false);
         listApp.start();
         final PatternLayout layout = PatternLayout.createLayout("%m %ex%n", null, null, null, null);
-        final ConsoleAppender<? extends Serializable> console =
+        final ConsoleAppender console =
                 ConsoleAppender.createAppender(layout, null, "SYSTEM_OUT", "Console", "false", "true");
         console.start();
         final Logger serverLogger = ctx.getLogger(JMSTopicReceiver.class.getName());
Index: core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/pattern/ExtendedThrowableTest.java	(working copy)
@@ -30,7 +30,8 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  *
@@ -38,18 +39,17 @@
 public class ExtendedThrowableTest {
     private static final String CONFIG = "log4j-throwablefilter.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java	(working copy)
@@ -42,24 +42,23 @@
 public class RegexReplacementTest {
     private static final String CONFIG = "log4j-replace.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
-    private static ListAppender<String> app2;
+    private static ListAppender app;
+    private static ListAppender app2;
     private static LoggerContext ctx;
 
     private static final String EXPECTED = "/RegexReplacementTest" + Constants.LINE_SEP;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             }
             if (entry.getKey().equals("List2")) {
-                app2 = (ListAppender<String>) entry.getValue();
+                app2 = (ListAppender) entry.getValue();
             }
         }
     }
Index: core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java	(working copy)
@@ -39,18 +39,17 @@
 public class RootThrowableTest {
     private static final String CONFIG = "log4j-rootthrowablefilter.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
             }
         }
     }
Index: core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/pattern/StyleConverterTest.java	(working copy)
@@ -41,7 +41,7 @@
 public class StyleConverterTest {
     private static final String CONFIG = "log4j-style.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     private static final String EXPECTED =
@@ -49,14 +49,13 @@
         + Constants.LINE_SEP;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java	(working copy)
@@ -38,18 +38,17 @@
 public class ThrowableTest {
     private static final String CONFIG = "log4j-throwable.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
-    @SuppressWarnings("unchecked")
     public static void setupClass() {
         System.setProperty(XMLConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
         ctx = (LoggerContext) LogManager.getContext(false);
         config = ctx.getConfiguration();
-        for (final Map.Entry<String, Appender<?>> entry : config.getAppenders().entrySet()) {
+        for (final Map.Entry<String, Appender> entry : config.getAppenders().entrySet()) {
             if (entry.getKey().equals("List")) {
-                app = (ListAppender<String>) entry.getValue();
+                app = (ListAppender) entry.getValue();
                 break;
             }
         }
Index: core/src/test/java/org/apache/logging/log4j/core/util/Compare.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/util/Compare.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/util/Compare.java	(working copy)
@@ -31,7 +31,7 @@
     static final int B2_NULL = -2;
 
     private static final InputStream open(
-        final Class testClass,
+        final Class<?> testClass,
         final String fileName) throws IOException {
         final String resourceName = fileName;
         /* if (fileName.startsWith("witness/")) {
@@ -53,7 +53,7 @@
         return is;
     }
 
-    public static boolean compare(final Class testClass,
+    public static boolean compare(final Class<?> testClass,
                                   final String file1,
                                   final String file2)
         throws IOException {
@@ -69,7 +69,7 @@
     }
 
     public static boolean compare(
-        final Class testClass, final String file1, final String file2, final BufferedReader in1, final BufferedReader in2) throws IOException {
+        final Class<?> testClass, final String file1, final String file2, final BufferedReader in1, final BufferedReader in2) throws IOException {
 
         String s1;
         int lineCounter = 0;
@@ -108,7 +108,7 @@
     /**
      * Prints file on the console.
      */
-    private static void outputFile(final Class testClass, final String file)
+    private static void outputFile(final Class<?> testClass, final String file)
         throws IOException {
         final InputStream is = open(testClass, file);
         final BufferedReader in1 = new BufferedReader(new InputStreamReader(is));
Index: core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/core/util/Profiler.java	(working copy)
@@ -23,7 +23,7 @@
  */
 public class Profiler {
     private static Object profiler;
-    private static Class profilingModes;
+    private static Class<?> profilingModes;
     private static Class<?> controllerClazz;
 
     static {
@@ -55,7 +55,7 @@
                 final Object[] args = new Object[2];
                 args[0] = f.getLong(profilingModes);
                 args[1] = "";
-                final Class[] parms = new Class[] {long.class, String.class};
+                final Class<?>[] parms = new Class<?>[] {long.class, String.class};
                 controllerClazz.getMethod("startCPUProfiling", parms).invoke(profiler, args);
             }
             catch (final Exception e) {
@@ -71,7 +71,7 @@
                 final Field f = profilingModes.getDeclaredField("SNAPSHOT_WITHOUT_HEAP");
                 final Object[] args = new Object[1];
                 args[0] = f.getLong(profilingModes);
-                final Class[] parms = new Class[] {long.class};
+                final Class<?>[] parms = new Class<?>[] {long.class};
                 profiler.getClass().getMethod("captureSnapshot", parms).invoke(profiler, args);
                 profiler.getClass().getMethod("stopCPUProfiling").invoke(profiler);
             }
Index: core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java	(working copy)
@@ -23,13 +23,11 @@
 import org.apache.logging.log4j.core.config.plugins.PluginAttr;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 
-import java.io.Serializable;
-
 /**
  *
  */
 @Plugin(name="AlwaysFail", category ="Core",elementType="appender",printObject=true)
-public class AlwaysFailAppender<T extends Serializable> extends AbstractAppender<T> {
+public class AlwaysFailAppender extends AbstractAppender {
 
     private AlwaysFailAppender(final String name) {
         super(name, null, null, false);
@@ -41,13 +39,13 @@
     }
 
     @PluginFactory
-    public static <S extends Serializable> AlwaysFailAppender<S> createAppender(@PluginAttr("name") final String name) {
+    public static AlwaysFailAppender createAppender(@PluginAttr("name") final String name) {
         if (name == null) {
             LOGGER.error("A name for the Appender must be specified");
             return null;
         }
 
-        return new AlwaysFailAppender<S>(name);
+        return new AlwaysFailAppender(name);
     }
 
 }
Index: core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/test/appender/FailOnceAppender.java	(working copy)
@@ -23,7 +23,6 @@
 import org.apache.logging.log4j.core.config.plugins.PluginAttr;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +30,7 @@
  *
  */
 @Plugin(name="FailOnce", category ="Core",elementType="appender",printObject=true)
-public class FailOnceAppender<T extends Serializable> extends AbstractAppender<T> {
+public class FailOnceAppender extends AbstractAppender {
 
     boolean fail = true;
 
@@ -58,13 +57,13 @@
     }
 
     @PluginFactory
-    public static <S extends Serializable> FailOnceAppender<S> createAppender(@PluginAttr("name") final String name) {
+    public static FailOnceAppender createAppender(@PluginAttr("name") final String name) {
         if (name == null) {
             LOGGER.error("A name for the Appender must be specified");
             return null;
         }
 
-        return new FailOnceAppender<S>(name);
+        return new FailOnceAppender(name);
     }
 
 }
Index: core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java	(working copy)
@@ -27,9 +27,9 @@
 /**
  *
  */
-public class InMemoryAppender<T extends Serializable> extends AbstractOutputStreamAppender<T> {
+public class InMemoryAppender extends AbstractOutputStreamAppender {
 
-    public InMemoryAppender(final String name, final Layout<T> layout, final CompositeFilter filters,
+    public InMemoryAppender(final String name, final Layout<? extends Serializable> layout, final CompositeFilter filters,
                             final boolean ignoreExceptions) {
         super(name, layout, filters, ignoreExceptions, true, new InMemoryManager(name, layout));
     }
@@ -41,7 +41,7 @@
 
     private static class InMemoryManager extends OutputStreamManager {
 
-        public InMemoryManager(final String name, final Layout layout) {
+        public InMemoryManager(final String name, final Layout<? extends Serializable> layout) {
             super(new ByteArrayOutputStream(), name, layout);
         }
 
Index: core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java
===================================================================
--- core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java	(revision 1514131)
+++ core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java	(working copy)
@@ -36,7 +36,7 @@
  * List could eventually grow to cause an OutOfMemoryError.
  */
 @Plugin(name = "List", category = "Core", elementType = "appender", printObject = true)
-public class ListAppender<T extends Serializable> extends AbstractAppender<T> {
+public class ListAppender extends AbstractAppender {
 
     private final List<LogEvent> events = new ArrayList<LogEvent>();
 
@@ -56,7 +56,7 @@
         raw = false;
     }
 
-    public ListAppender(final String name, final Filter filter, final Layout<T> layout, final boolean newline,
+    public ListAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout, final boolean newline,
                         final boolean raw) {
         super(name, filter, layout);
         this.newLine = newline;
@@ -71,7 +71,7 @@
 
     @Override
     public synchronized void append(final LogEvent event) {
-        final Layout layout = getLayout();
+        final Layout<? extends Serializable> layout = getLayout();
         if (layout == null) {
             events.add(event);
         } else if (layout instanceof SerializedLayout) {
@@ -126,7 +126,7 @@
     @Override
     public void stop() {
         super.stop();
-        final Layout layout = getLayout();
+        final Layout<? extends Serializable> layout = getLayout();
         if (layout != null) {
             final byte[] bytes = layout.getFooter();
             if (bytes != null) {
@@ -154,10 +154,10 @@
     }
 
     @PluginFactory
-    public static <S extends Serializable> ListAppender<S> createAppender(@PluginAttr("name") final String name,
+    public static ListAppender createAppender(@PluginAttr("name") final String name,
                                               @PluginAttr("entryPerNewLine") final String newLine,
                                               @PluginAttr("raw") final String raw,
-                                              @PluginElement("Layout") final Layout<S> layout,
+                                              @PluginElement("Layout") final Layout<? extends Serializable> layout,
                                               @PluginElement("Filters") final Filter filter) {
 
         if (name == null) {
@@ -168,6 +168,6 @@
         final boolean nl = Boolean.parseBoolean(newLine);
         final boolean r = Boolean.parseBoolean(raw);
 
-        return new ListAppender<S>(name, filter, layout, nl, r);
+        return new ListAppender(name, filter, layout, nl, r);
     }
 }
Index: flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java
===================================================================
--- flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java	(revision 1514131)
+++ flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java	(working copy)
@@ -34,10 +34,9 @@
 
 /**
  * An Appender that uses the Avro protocol to route events to Flume.
- * @param <T> The {@link Layout}'s {@link Serializable} type.
  */
 @Plugin(name = "Flume", category = "Core", elementType = "appender", printObject = true)
-public final class FlumeAppender<T extends Serializable> extends AbstractAppender<T> implements FlumeEventFactory {
+public final class FlumeAppender extends AbstractAppender implements FlumeEventFactory {
 
     private static final String[] EXCLUDED_PACKAGES = {"org.apache.flume", "org.apache.avro"};
     private static final int DEFAULT_MAX_DELAY = 60000;
@@ -67,7 +66,7 @@
         }
     }
 
-    private FlumeAppender(final String name, final Filter filter, final Layout<T> layout,
+    private FlumeAppender(final String name, final Filter filter, final Layout<? extends Serializable> layout,
                           final boolean ignoreExceptions, final String includes, final String excludes,
                           final String required, final String mdcPrefix, final String eventPrefix,
                           final boolean compress, final FlumeEventFactory factory, final AbstractFlumeManager manager) {
@@ -158,7 +157,7 @@
      * @return A Flume Avro Appender.
      */
     @PluginFactory
-    public static <S extends Serializable> FlumeAppender<S> createAppender(@PluginElement("Agents") Agent[] agents,
+    public static FlumeAppender createAppender(@PluginElement("Agents") Agent[] agents,
                                                    @PluginElement("Properties") final Property[] properties,
                                                    @PluginAttr("embedded") final String embedded,
                                                    @PluginAttr("type") final String type,
@@ -177,7 +176,7 @@
                                                    @PluginAttr("compress") final String compressBody,
                                                    @PluginAttr("batchSize") final String batchSize,
                                                    @PluginElement("FlumeEventFactory") final FlumeEventFactory factory,
-                                                   @PluginElement("Layout") Layout<S> layout,
+                                                   @PluginElement("Layout") Layout<? extends Serializable> layout,
                                                    @PluginElement("Filters") final Filter filter) {
 
         final boolean embed = embedded != null ? Boolean.parseBoolean(embedded) :
@@ -216,11 +215,8 @@
         final int delay = Integers.parseInt(maxDelay, DEFAULT_MAX_DELAY );
 
         if (layout == null) {
-            @SuppressWarnings({ "unchecked", "UnnecessaryLocalVariable" })
-			final
-            Layout<S> l = (Layout<S>) RFC5424Layout.createLayout(null, null, null, "True", null, mdcPrefix, eventPrefix,
+            layout = RFC5424Layout.createLayout(null, null, null, "True", null, mdcPrefix, eventPrefix,
                     null, null, null, excludes, includes, required, null, null, null, null);
-            layout = l;
         }
 
         if (name == null) {
@@ -262,7 +258,7 @@
             return null;
         }
 
-        return new FlumeAppender<S>(name, filter, layout,  ignoreExceptions, includes,
+        return new FlumeAppender(name, filter, layout,  ignoreExceptions, includes,
             excludes, required, mdcPrefix, eventPrefix, compress, factory, manager);
     }
 }
Index: flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java
===================================================================
--- flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java	(revision 1514131)
+++ flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumePersistentManager.java	(working copy)
@@ -382,13 +382,13 @@
                 if (key != null) {
                     final PluginManager manager = new PluginManager("KeyProvider", SecretKeyProvider.class);
                     manager.collectPlugins();
-                    final Map<String, PluginType> plugins = manager.getPlugins();
+                    final Map<String, PluginType<?>> plugins = manager.getPlugins();
                     if (plugins != null) {
                         boolean found = false;
-                        for (final Map.Entry<String, PluginType> entry : plugins.entrySet()) {
+                        for (final Map.Entry<String, PluginType<?>> entry : plugins.entrySet()) {
                             if (entry.getKey().equalsIgnoreCase(key)) {
                                 found = true;
-                                final Class cl = entry.getValue().getPluginClass();
+                                final Class<?> cl = entry.getValue().getPluginClass();
                                 try {
                                     final SecretKeyProvider provider = (SecretKeyProvider) cl.newInstance();
                                     secretKey = provider.getSecretKey();
Index: flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
===================================================================
--- flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java	(revision 1514131)
+++ flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java	(working copy)
@@ -372,15 +372,15 @@
 
 
     private void removeAppenders(final Logger logger) {
-        final Map<String,Appender<?>> map = logger.getAppenders();
-        for (final Map.Entry<String, Appender<?>> entry : map.entrySet()) {
-            final Appender<?> app = entry.getValue();
+        final Map<String,Appender> map = logger.getAppenders();
+        for (final Map.Entry<String, Appender> entry : map.entrySet()) {
+            final Appender app = entry.getValue();
             avroLogger.removeAppender(app);
             app.stop();
         }
     }
 
-    private Appender<?> getAppender(final Logger logger, final String name) {
+    private Appender getAppender(final Logger logger, final String name) {
         return logger.getAppenders().get(name);
     }
 
Index: jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java
===================================================================
--- jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java	(revision 1514131)
+++ jcl-bridge/src/main/java/org/apache/logging/log4j/jcl/LogFactoryImpl.java	(working copy)
@@ -77,7 +77,7 @@
     }
 
     @Override
-    public Log getInstance(final Class clazz) throws LogConfigurationException {
+    public Log getInstance(@SuppressWarnings("rawtypes") final Class clazz) throws LogConfigurationException {
         return getInstance(clazz.getName());
     }
 
Index: jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java
===================================================================
--- jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java	(revision 1514131)
+++ jcl-bridge/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java	(working copy)
@@ -70,14 +70,13 @@
         verify("List", "o.a.l.l.j.LoggerTest Info Message {} MDC{}" + Constants.LINE_SEP);
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String name, final String expected) {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get(name);
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get(name);
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1);
         final String actual = events.get(0);
         assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual);
Index: log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
===================================================================
--- log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java	(revision 1514131)
+++ log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java	(working copy)
@@ -24,12 +24,17 @@
 import java.util.Date;
 import java.util.List;
 
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.message.ParameterizedMessageFactory;
 import org.apache.logging.log4j.message.StringFormatterMessageFactory;
+
+import ch.qos.logback.core.testUtil.StringListAppender;
+import ch.qos.logback.classic.LoggerContext;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
Index: log4j12-api/src/main/java/org/apache/log4j/Category.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/Category.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/Category.java	(working copy)
@@ -92,11 +92,11 @@
         return prev == null ? logger : prev;
     }
 
-    public static Category getInstance(final Class clazz) {
+    public static Category getInstance(@SuppressWarnings("rawtypes") final Class clazz) {
         return getInstance(clazz.getName());
     }
 
-    static Category getInstance(final LoggerContext context, final Class clazz) {
+    static Category getInstance(final LoggerContext context, @SuppressWarnings("rawtypes") final Class clazz) {
         return getInstance(context, clazz.getName());
     }
 
@@ -148,6 +148,7 @@
 
      @deprecated Please use {@link LogManager#getCurrentLoggers()} instead.
      */
+    @SuppressWarnings("rawtypes")
     @Deprecated
     public static Enumeration getCurrentCategories() {
         return LogManager.getCurrentLoggers();
@@ -281,6 +282,7 @@
     public void callAppenders(final LoggingEvent event) {
     }
 
+    @SuppressWarnings("rawtypes")
     public Enumeration getAllAppenders() {
         return NullEnumeration.getInstance();
     }
Index: log4j12-api/src/main/java/org/apache/log4j/LogManager.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/LogManager.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/LogManager.java	(working copy)
@@ -73,7 +73,7 @@
         return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), name);
     }
 
-    public static Logger getLogger(final Class clazz) {
+    public static Logger getLogger(@SuppressWarnings("rawtypes") final Class clazz) {
         return (Logger) Category.getInstance((LoggerContext) PrivateManager.getContext(), clazz.getName());
     }
 
@@ -89,6 +89,7 @@
         return Logger.getLogger(name);
     }
 
+    @SuppressWarnings("rawtypes")
     public static Enumeration getCurrentLoggers() {
         return NullEnumeration.getInstance();
     }
@@ -183,11 +184,13 @@
         }
 
         @Override
+        @SuppressWarnings("rawtypes")
         public Enumeration getCurrentLoggers() {
             return NullEnumeration.getInstance();
         }
 
         @Override
+        @SuppressWarnings("rawtypes")
         public Enumeration getCurrentCategories() {
             return NullEnumeration.getInstance();
         }
Index: log4j12-api/src/main/java/org/apache/log4j/NDC.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/NDC.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/NDC.java	(working copy)
@@ -52,6 +52,7 @@
      *
      * @return Stack A clone of the current thread's  diagnostic context.
      */
+    @SuppressWarnings("rawtypes")
     public static Stack cloneStack() {
         final Stack<String> stack = new Stack<String>();
         for (final String element : org.apache.logging.log4j.ThreadContext.cloneStack().asList()) {
Index: log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/helpers/NullEnumeration.java	(working copy)
@@ -24,6 +24,7 @@
  *
  * @since version 1.0
  */
+@SuppressWarnings("rawtypes")
 public final class NullEnumeration implements Enumeration {
     private static final NullEnumeration INSTANCE = new NullEnumeration();
 
Index: log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/spi/LoggerRepository.java	(working copy)
@@ -91,6 +91,7 @@
 
     void shutdown();
 
+    @SuppressWarnings("rawtypes")
     Enumeration getCurrentLoggers();
 
     /**
@@ -98,6 +99,7 @@
      *
      * @return an enumeration of loggers.
      */
+    @SuppressWarnings("rawtypes")
     Enumeration getCurrentCategories();
 
     void fireAddAppenderEvent(Category logger, Appender appender);
Index: log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java
===================================================================
--- log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java	(revision 1514131)
+++ log4j12-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java	(working copy)
@@ -20,6 +20,7 @@
 import java.io.Reader;
 import java.net.URL;
 import java.util.Properties;
+
 import javax.xml.parsers.FactoryConfigurationError;
 
 import org.apache.log4j.config.PropertySetter;
@@ -71,7 +72,7 @@
 
     }
 
-    public static Object parseElement(final Element element, final Properties props, final Class expectedClass)
+    public static Object parseElement(final Element element, final Properties props, @SuppressWarnings("rawtypes") final Class expectedClass)
         throws Exception {
         return null;
     }
Index: log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java
===================================================================
--- log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java	(revision 1514131)
+++ log4j12-api/src/test/java/org/apache/log4j/CategoryTest.java	(working copy)
@@ -43,7 +43,7 @@
 
     static ConfigurationFactory cf = new BasicConfigurationFactory();
 
-    private static ListAppender<LogEvent> appender = new ListAppender<LogEvent>("List");
+    private static ListAppender appender = new ListAppender("List");
 
     @BeforeClass
     public static void setupClass() {
@@ -162,7 +162,7 @@
     public void testClassName() {
         final Category category = Category.getInstance("TestCategory");
         final Layout<String> layout = PatternLayout.createLayout("%d %p %C{1.} [%t] %m%n", null, null, null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List2", null, layout, false, false);
+        final ListAppender appender = new ListAppender("List2", null, layout, false, false);
         appender.start();
         category.setAdditivity(false);
         category.getLogger().addAppender(appender);
Index: log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java
===================================================================
--- log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java	(revision 1514131)
+++ log4j12-api/src/test/java/org/apache/log4j/LoggerTest.java	(working copy)
@@ -17,7 +17,13 @@
 
 package org.apache.log4j;
 
-import java.io.Serializable;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -34,8 +40,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Used for internal unit testing the Logger class.
  */
@@ -119,7 +123,7 @@
     public void testAdditivity1() {
         final Logger a = Logger.getLogger("a");
         final Logger ab = Logger.getLogger("a.b");
-        final CountingAppender<LogEvent> ca = new CountingAppender<LogEvent>();
+        final CountingAppender ca = new CountingAppender();
         ca.start();
         a.getLogger().addAppender(ca);
 
@@ -147,9 +151,9 @@
         final Logger abc = Logger.getLogger("a.b.c");
         final Logger x = Logger.getLogger("x");
 
-        final CountingAppender<LogEvent> ca1 = new CountingAppender<LogEvent>();
+        final CountingAppender ca1 = new CountingAppender();
         ca1.start();
-        final CountingAppender<LogEvent> ca2 = new CountingAppender<LogEvent>();
+        final CountingAppender ca2 = new CountingAppender();
         ca2.start();
 
         a.getLogger().addAppender(ca1);
@@ -187,11 +191,11 @@
         final Logger abc = Logger.getLogger("a.b.c");
         Logger.getLogger("x");
 
-        final CountingAppender<LogEvent> caRoot = new CountingAppender<LogEvent>();
+        final CountingAppender caRoot = new CountingAppender();
         caRoot.start();
-        final CountingAppender<LogEvent> caA = new CountingAppender<LogEvent>();
+        final CountingAppender caA = new CountingAppender();
         caA.start();
-        final CountingAppender<LogEvent> caABC = new CountingAppender<LogEvent>();
+        final CountingAppender caABC = new CountingAppender();
         caABC.start();
 
         root.getLogger().addAppender(caRoot);
@@ -384,7 +388,7 @@
      */
     @Test
     public void testTrace() {
-        final ListAppender<LogEvent> appender = new ListAppender<LogEvent>("List");
+        final ListAppender appender = new ListAppender("List");
         appender.start();
         final Logger root = Logger.getRootLogger();
         root.getLogger().addAppender(appender);
@@ -411,7 +415,7 @@
      */
     @Test
     public void testTraceWithException() {
-        final ListAppender<LogEvent> appender = new ListAppender<LogEvent>("List");
+        final ListAppender appender = new ListAppender("List");
         appender.start();
         final Logger root = Logger.getRootLogger();
         root.getLogger().addAppender(appender);
@@ -439,7 +443,7 @@
      */
     @Test
     public void testIsTraceEnabled() {
-        final ListAppender<LogEvent> appender = new ListAppender<LogEvent>("List");
+        final ListAppender appender = new ListAppender("List");
         appender.start();
         final Logger root = Logger.getRootLogger();
         root.getLogger().addAppender(appender);
@@ -458,7 +462,7 @@
     @SuppressWarnings("deprecation")
     public void testLog() {
         final PatternLayout layout = PatternLayout.createLayout("%d %C %L %m", null, null, null, null);
-        final ListAppender<String> appender = new ListAppender<String>("List", null, layout, false, false);
+        final ListAppender appender = new ListAppender("List", null, layout, false, false);
         appender.start();
         final Logger root = Logger.getRootLogger();
         root.getLogger().addAppender(appender);
@@ -489,7 +493,7 @@
         }
     }
 
-    private static class CountingAppender<T extends Serializable> extends AbstractAppender<T> {
+    private static class CountingAppender extends AbstractAppender {
 
         int counter;
 
Index: log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java
===================================================================
--- log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java	(revision 1514131)
+++ log4j12-api/src/test/java/org/apache/log4j/LoggingTest.java	(working copy)
@@ -36,7 +36,7 @@
 
     private static final String CONFIG = "log4j2-config.xml";
     private static Configuration config;
-    private static ListAppender<String> app;
+    private static ListAppender app;
     private static LoggerContext ctx;
 
     @BeforeClass
@@ -51,7 +51,6 @@
     }
 
     @Before
-    @SuppressWarnings("unchecked")
     public void before() {
         config = ctx.getConfiguration();
     }
Index: samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
===================================================================
--- samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java	(revision 1514131)
+++ samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java	(working copy)
@@ -44,9 +44,9 @@
     private static class AuditProxy implements InvocationHandler {
 
         private final StructuredDataMessage msg;
-        private final Class intrface;
+        private final Class<?> intrface;
 
-        public AuditProxy(final StructuredDataMessage msg, final Class intrface) {
+        public AuditProxy(final StructuredDataMessage msg, final Class<?> intrface) {
             this.msg = msg;
             this.intrface = intrface;
         }
Index: slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java
===================================================================
--- slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java	(revision 1514131)
+++ slf4j-impl/src/main/java/org/slf4j/helpers/EventDataConverter.java	(working copy)
@@ -18,13 +18,13 @@
             final EventData data = (objects != null && objects[0] instanceof EventData) ? (EventData) objects[0] :
                 new EventData(s1);
             msg = new StructuredDataMessage(data.getEventId(), data.getMessage(), data.getEventType());
-            for (final Map.Entry entry : data.getEventMap().entrySet()) {
-                final String key = entry.getKey().toString();
+            for (final Map.Entry<String, Object> entry : data.getEventMap().entrySet()) {
+                final String key = entry.getKey();
                 if (EventData.EVENT_TYPE.equals(key) || EventData.EVENT_ID.equals(key) ||
                     EventData.EVENT_MESSAGE.equals(key)) {
                     continue;
                 }
-                ((StructuredDataMessage) msg).put(entry.getKey().toString(), entry.getValue().toString());
+                ((StructuredDataMessage) msg).put(entry.getKey(), String.valueOf(entry.getValue()));
             }
         } catch (final Exception ex) {
             msg = new ParameterizedMessage(s1, objects, throwable);
Index: slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java
===================================================================
--- slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java	(revision 1514131)
+++ slf4j-impl/src/main/java/org/slf4j/helpers/Log4jMDCAdapter.java	(working copy)
@@ -53,7 +53,7 @@
 
     @Override
     @SuppressWarnings("unchecked") // nothing we can do about this, restricted by SLF4J API
-    public void setContextMap(final Map map) {
+    public void setContextMap(@SuppressWarnings("rawtypes") final Map map) {
         ThreadContext.clear();
         for (final Map.Entry<String, String> entry : ((Map<String, String>) map).entrySet()) {
             ThreadContext.put(entry.getKey(), entry.getValue());
Index: slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java
===================================================================
--- slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java	(revision 1514131)
+++ slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java	(working copy)
@@ -169,14 +169,13 @@
         verify("EventLogger", "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete" + Constants.LINE_SEP);
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String name, final String expected) {
         //LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get(name);
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get(name);
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1);
         final String actual = events.get(0);
         assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual);
@@ -186,10 +185,10 @@
     @Before
     public void cleanup()
     {
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get("List");
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get("List");
         ((ListAppender) listApp).clear();
-        final Appender<?> eventApp = list.get("EventLogger");
+        final Appender eventApp = list.get("EventLogger");
         ((ListAppender) eventApp).clear();
     }
 }
Index: slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java
===================================================================
--- slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java	(revision 1514131)
+++ slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java	(working copy)
@@ -70,14 +70,13 @@
         verify("EventLogger", "o.a.l.s.OptionalTest This is a test" + Constants.LINE_SEP);
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String name, final String expected) {
         //LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get(name);
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get(name);
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         assertTrue("Incorrect number of messages. Expected 1 Actual " + events.size(), events.size()== 1);
         final String actual = events.get(0);
         assertEquals("Incorrect message. Expected " + expected + ". Actual " + actual, expected, actual);
@@ -87,10 +86,10 @@
     @Before
     public void cleanup()
     {
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get("List");
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get("List");
         ((ListAppender) listApp).clear();
-        final Appender<?> eventApp = list.get("EventLogger");
+        final Appender eventApp = list.get("EventLogger");
         ((ListAppender) eventApp).clear();
     }
 }
Index: taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java
===================================================================
--- taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java	(revision 1514131)
+++ taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java	(working copy)
@@ -93,14 +93,13 @@
         verify("catching WARN M-CATCHING[ EXCEPTION ] E java.lang.Error: This is the last test.");
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String expected) {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get("List");
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get("List");
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1, events.size());
Index: taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
===================================================================
--- taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java	(revision 1514131)
+++ taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java	(working copy)
@@ -81,14 +81,13 @@
         verify("entry params(log4j-test1.xml, 5792) TRACE M-ENTRY[ FLOW ] E");
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String expected) {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get("List");
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get("List");
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1, events.size());
Index: taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java
===================================================================
--- taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java	(revision 1514131)
+++ taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java	(working copy)
@@ -88,14 +88,13 @@
         verify("exit with(5792) TRACE M-EXIT[ FLOW ] E");
     }
 
-    @SuppressWarnings("unchecked")
     private void verify(final String expected) {
         final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-        final Map<String, Appender<?>> list = ctx.getConfiguration().getAppenders();
-        final Appender<?> listApp = list.get("List");
+        final Map<String, Appender> list = ctx.getConfiguration().getAppenders();
+        final Appender listApp = list.get("List");
         assertNotNull("Missing Appender", listApp);
         assertTrue("Not a ListAppender", listApp instanceof ListAppender);
-        final List<String> events = ((ListAppender<String>) listApp).getMessages();
+        final List<String> events = ((ListAppender) listApp).getMessages();
         try
         {
             assertEquals("Incorrect number of messages.", 1, events.size());