diff --git a/core/src/main/java/io/undertow/UndertowLogger.java b/core/src/main/java/io/undertow/UndertowLogger.java
index 7fd2147acd..3bdfcc23ad 100644
--- a/core/src/main/java/io/undertow/UndertowLogger.java
+++ b/core/src/main/java/io/undertow/UndertowLogger.java
@@ -81,7 +81,7 @@ public interface UndertowLogger extends BasicLogger {
 
 //    @LogMessage(level = INFO)
 //    @Message(id = 5002, value = "Exception reading file %s: %s")
-//    void exceptionReadingFile(final Path file, final IOException e);
+//    void exceptionReadingFile(Path file, IOException e);
 
     @LogMessage(level = ERROR)
     @Message(id = 5003, value = "IOException reading from channel")
@@ -101,15 +101,15 @@ public interface UndertowLogger extends BasicLogger {
 
     @LogMessage(level = DEBUG)
     @Message(id = 5008, value = "An invalid token '%s' with value '%s' has been received.")
-    void invalidTokenReceived(final String tokenName, final String tokenValue);
+    void invalidTokenReceived(String tokenName, String tokenValue);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5009, value = "A mandatory token %s is missing from the request.")
-    void missingAuthorizationToken(final String tokenName);
+    void missingAuthorizationToken(String tokenName);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5010, value = "Verification of authentication tokens for user '%s' has failed using mechanism '%s'.")
-    void authenticationFailed(final String userName, final String mechanism);
+    void authenticationFailed(String userName, String mechanism);
 
     @LogMessage(level = ERROR)
     @Message(id = 5011, value = "Ignoring AJP request with prefix %s")
@@ -443,23 +443,23 @@ void nodeConfigCreated(URI connectionURI, String balancer, String domain, String
 
     @LogMessage(level = DEBUG)
     @Message(id = 5096, value = "Authentication failed for digest header %s in %s")
-    void authenticationFailedFor(final String header, final HttpServerExchange exchange, final @Cause Exception e);
+    void authenticationFailedFor(String header, HttpServerExchange exchange, @Cause Exception e);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5097, value = "Failed to obtain subject for %s")
-    void failedToObtainSubject(final HttpServerExchange exchange, final @Cause GeneralSecurityException e);
+    void failedToObtainSubject(HttpServerExchange exchange, @Cause GeneralSecurityException e);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5098, value = "GSSAPI negotiation failed for %s")
-    void failedToNegotiateAtGSSAPI(final HttpServerExchange exchange, final @Cause Throwable e);
+    void failedToNegotiateAtGSSAPI(HttpServerExchange exchange, @Cause Throwable e);
 
     @LogMessage(level = WARN)
     @Message(id = 5099, value = "Failed to create SSO for session '%s'")
-    void failedToCreateSSOForSession(final String sessionId);
+    void failedToCreateSSOForSession(String sessionId);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5100, value = "Failed to list paths for '%s'")
-    void failedToListPathsForFile(final Path f);
+    void failedToListPathsForFile(Path f);
 
     @LogMessage(level = DEBUG)
     @Message(id = 5101, value = "No source to list resources from")
diff --git a/core/src/main/java/io/undertow/UndertowMessages.java b/core/src/main/java/io/undertow/UndertowMessages.java
index 10202e3720..553863570e 100644
--- a/core/src/main/java/io/undertow/UndertowMessages.java
+++ b/core/src/main/java/io/undertow/UndertowMessages.java
@@ -85,7 +85,7 @@ public interface UndertowMessages {
     IllegalStateException sessionManagerNotFound();
 
     @Message(id = 13, value = "Argument %s cannot be null")
-    IllegalArgumentException argumentCannotBeNull(final String argument);
+    IllegalArgumentException argumentCannotBeNull(String argument);
 
 //    @Message(id = 14, value = "close() called with data still to be flushed. Please call shutdownWrites() and then call flush() until it returns true before calling close()")
 //    IOException closeCalledWithDataStillToBeFlushed();
@@ -112,13 +112,13 @@ public interface UndertowMessages {
     IllegalArgumentException hashAlgorithmNotFound(String algorithmName);
 
     @Message(id = 23, value = "An invalid Base64 token has been received.")
-    IllegalArgumentException invalidBase64Token(@Cause final IOException cause);
+    IllegalArgumentException invalidBase64Token(@Cause IOException cause);
 
     @Message(id = 24, value = "An invalidly formatted nonce has been received.")
     IllegalArgumentException invalidNonceReceived();
 
     @Message(id = 25, value = "Unexpected token '%s' within header.")
-    IllegalArgumentException unexpectedTokenInHeader(final String name);
+    IllegalArgumentException unexpectedTokenInHeader(String name);
 
     @Message(id = 26, value = "Invalid header received.")
     IllegalArgumentException invalidHeader();
@@ -133,10 +133,10 @@ public interface UndertowMessages {
     IOException chunkedChannelClosedMidChunk();
 
     @Message(id = 30, value = "User %s successfully authenticated.")
-    String userAuthenticated(final String userName);
+    String userAuthenticated(String userName);
 
     @Message(id = 31, value = "User %s has logged out.")
-    String userLoggedOut(final String userName);
+    String userLoggedOut(String userName);
 //
 //    @Message(id = 33, value = "Authentication type %s cannot be combined with %s")
 //    IllegalStateException authTypeCannotBeCombined(String type, String existing);
@@ -154,7 +154,7 @@ public interface UndertowMessages {
     RuntimeException failedToParsePath();
 
     @Message(id = 38, value = "Authentication failed, requested user name '%s'")
-    String authenticationFailed(final String userName);
+    String authenticationFailed(String userName);
 
     @Message(id = 39, value = "Too many query parameters, cannot have more than %s query parameters")
     BadRequestException tooManyQueryParameters(int noParams);
diff --git a/core/src/main/java/io/undertow/attribute/ExchangeAttribute.java b/core/src/main/java/io/undertow/attribute/ExchangeAttribute.java
index e382af37a7..0aac002acd 100644
--- a/core/src/main/java/io/undertow/attribute/ExchangeAttribute.java
+++ b/core/src/main/java/io/undertow/attribute/ExchangeAttribute.java
@@ -33,7 +33,7 @@ public interface ExchangeAttribute {
      * @param exchange The exchange
      * @return The attribute
      */
-    String readAttribute(final HttpServerExchange exchange);
+    String readAttribute(HttpServerExchange exchange);
 
     /**
      * Sets a new value for the attribute. Not all attributes are writable.
@@ -41,5 +41,5 @@ public interface ExchangeAttribute {
      * @param newValue The new value for the attribute
      * @throws  ReadOnlyAttributeException when attribute cannot be written
      */
-    void writeAttribute(final HttpServerExchange exchange, final String newValue) throws ReadOnlyAttributeException;
+    void writeAttribute(HttpServerExchange exchange, String newValue) throws ReadOnlyAttributeException;
 }
diff --git a/core/src/main/java/io/undertow/attribute/ExchangeAttributeBuilder.java b/core/src/main/java/io/undertow/attribute/ExchangeAttributeBuilder.java
index ca7a048121..8784ab7c0d 100644
--- a/core/src/main/java/io/undertow/attribute/ExchangeAttributeBuilder.java
+++ b/core/src/main/java/io/undertow/attribute/ExchangeAttributeBuilder.java
@@ -41,7 +41,7 @@ public interface ExchangeAttributeBuilder {
      * @param token The string token
      * @return The exchange attribute, or null
      */
-    ExchangeAttribute build(final String token);
+    ExchangeAttribute build(String token);
 
     /**
      * The priority of the builder. Builders will be tried in priority builder. Built in builders use the priority range 0-100,
diff --git a/core/src/main/java/io/undertow/client/ClientConnection.java b/core/src/main/java/io/undertow/client/ClientConnection.java
index 12a60782b6..d97e4627ff 100644
--- a/core/src/main/java/io/undertow/client/ClientConnection.java
+++ b/core/src/main/java/io/undertow/client/ClientConnection.java
@@ -56,7 +56,7 @@ public interface ClientConnection extends Channel {
      *
      * @param request The request to send.
      */
-    void sendRequest(final ClientRequest request, final ClientCallback<ClientExchange> clientCallback);
+    void sendRequest(ClientRequest request, ClientCallback<ClientExchange> clientCallback);
 
     /**
      * Upgrade the connection, if the underlying protocol supports it. This should only be called after an upgrade request
diff --git a/core/src/main/java/io/undertow/client/ClientExchange.java b/core/src/main/java/io/undertow/client/ClientExchange.java
index cd934f8fd0..279be431c8 100644
--- a/core/src/main/java/io/undertow/client/ClientExchange.java
+++ b/core/src/main/java/io/undertow/client/ClientExchange.java
@@ -27,9 +27,9 @@
  */
 public interface ClientExchange extends Attachable {
 
-    void setResponseListener(final ClientCallback<ClientExchange> responseListener);
+    void setResponseListener(ClientCallback<ClientExchange> responseListener);
 
-    void setContinueHandler(final ContinueNotification continueHandler);
+    void setContinueHandler(ContinueNotification continueHandler);
 
     void setPushHandler(PushCallback pushCallback);
 
diff --git a/core/src/main/java/io/undertow/client/ClientProvider.java b/core/src/main/java/io/undertow/client/ClientProvider.java
index 5b89e84bd7..13befb5082 100644
--- a/core/src/main/java/io/undertow/client/ClientProvider.java
+++ b/core/src/main/java/io/undertow/client/ClientProvider.java
@@ -38,12 +38,12 @@ public interface ClientProvider {
 
     Set<String> handlesSchemes();
 
-    void connect(final ClientCallback<ClientConnection> listener, final URI uri, final XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
+    void connect(ClientCallback<ClientConnection> listener, URI uri, XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
 
-    void connect(final ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, final URI uri, final XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
+    void connect(ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, URI uri, XnioWorker worker, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
 
-    void connect(final ClientCallback<ClientConnection> listener, final URI uri, final XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
+    void connect(ClientCallback<ClientConnection> listener, URI uri, XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
 
-    void connect(final ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, final URI uri, final XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
+    void connect(ClientCallback<ClientConnection> listener, InetSocketAddress bindAddress, URI uri, XnioIoThread ioThread, XnioSsl ssl, ByteBufferPool bufferPool, OptionMap options);
 
 }
diff --git a/core/src/main/java/io/undertow/client/UndertowClientMessages.java b/core/src/main/java/io/undertow/client/UndertowClientMessages.java
index 2fc52edf1d..cac6c8a98f 100644
--- a/core/src/main/java/io/undertow/client/UndertowClientMessages.java
+++ b/core/src/main/java/io/undertow/client/UndertowClientMessages.java
@@ -46,7 +46,7 @@ public interface UndertowClientMessages {
 
     // 1020
     @Message(id = 1020, value = "Failed to upgrade channel due to response %s (%s)")
-    String failedToUpgradeChannel(final int responseCode, String reason);
+    String failedToUpgradeChannel(int responseCode, String reason);
 
     // 1030
     @Message(id = 1030, value = "invalid content length %d")
diff --git a/core/src/main/java/io/undertow/conduits/AbstractFramedStreamSinkConduit.java b/core/src/main/java/io/undertow/conduits/AbstractFramedStreamSinkConduit.java
index 8ca6ed87af..fe233e47dd 100644
--- a/core/src/main/java/io/undertow/conduits/AbstractFramedStreamSinkConduit.java
+++ b/core/src/main/java/io/undertow/conduits/AbstractFramedStreamSinkConduit.java
@@ -256,7 +256,7 @@ public interface FrameCallBack {
 
         void done();
 
-        void failed(final IOException e);
+        void failed(IOException e);
 
     }
 
diff --git a/core/src/main/java/io/undertow/io/BufferWritableOutputStream.java b/core/src/main/java/io/undertow/io/BufferWritableOutputStream.java
index 615cf959af..63ca9a9d88 100644
--- a/core/src/main/java/io/undertow/io/BufferWritableOutputStream.java
+++ b/core/src/main/java/io/undertow/io/BufferWritableOutputStream.java
@@ -30,9 +30,9 @@
  */
 public interface BufferWritableOutputStream {
 
-    void write(final ByteBuffer[] buffers) throws IOException;
+    void write(ByteBuffer[] buffers) throws IOException;
 
-    void write(final ByteBuffer byteBuffer) throws IOException;
+    void write(ByteBuffer byteBuffer) throws IOException;
 
     void transferFrom(FileChannel source) throws IOException;
 
diff --git a/core/src/main/java/io/undertow/io/IoCallback.java b/core/src/main/java/io/undertow/io/IoCallback.java
index f456d6f493..f2781e4d2f 100644
--- a/core/src/main/java/io/undertow/io/IoCallback.java
+++ b/core/src/main/java/io/undertow/io/IoCallback.java
@@ -27,9 +27,9 @@
  */
 public interface IoCallback {
 
-    void onComplete(final HttpServerExchange exchange, final Sender sender);
+    void onComplete(HttpServerExchange exchange, Sender sender);
 
-    void onException(final HttpServerExchange exchange, final Sender sender, final IOException exception);
+    void onException(HttpServerExchange exchange, Sender sender, IOException exception);
 
     /**
      * A default callback that simply ends the exchange.
diff --git a/core/src/main/java/io/undertow/io/Sender.java b/core/src/main/java/io/undertow/io/Sender.java
index 9b2865053a..c5450e4ad0 100644
--- a/core/src/main/java/io/undertow/io/Sender.java
+++ b/core/src/main/java/io/undertow/io/Sender.java
@@ -42,7 +42,7 @@ public interface Sender {
      * @param buffer   The buffer to send.
      * @param callback The callback
      */
-    void send(final ByteBuffer buffer, final IoCallback callback);
+    void send(ByteBuffer buffer, IoCallback callback);
 
     /**
      * Write the given buffers using async IO, and calls the given callback on completion or error.
@@ -50,21 +50,21 @@ public interface Sender {
      * @param buffer   The buffers to send.
      * @param callback The callback
      */
-    void send(final ByteBuffer[] buffer, final IoCallback callback);
+    void send(ByteBuffer[] buffer, IoCallback callback);
 
     /**
      * Write the given buffer using async IO, and ends the exchange when done
      *
      * @param buffer   The buffer to send.
      */
-    void send(final ByteBuffer buffer);
+    void send(ByteBuffer buffer);
 
     /**
      * Write the given buffers using async IO, and ends the exchange when done
      *
      * @param buffer   The buffers to send.
      */
-    void send(final ByteBuffer[] buffer);
+    void send(ByteBuffer[] buffer);
 
     /**
      * Write the given String using async IO, and calls the given callback on completion or error.
@@ -74,7 +74,7 @@ public interface Sender {
      * @param data     The data to send
      * @param callback The callback
      */
-    void send(final String data, final IoCallback callback);
+    void send(String data, IoCallback callback);
 
     /**
      * Write the given String using async IO, and calls the given callback on completion or error.
@@ -83,7 +83,7 @@ public interface Sender {
      * @param charset  The charset to use
      * @param callback The callback
      */
-    void send(final String data, final Charset charset, final IoCallback callback);
+    void send(String data, Charset charset, IoCallback callback);
 
 
     /**
@@ -93,7 +93,7 @@ public interface Sender {
      *
      * @param data     The data to send
      */
-    void send(final String data);
+    void send(String data);
 
     /**
      * Write the given String using async IO, and ends the exchange when done
@@ -101,7 +101,7 @@ public interface Sender {
      * @param data     The buffer to end.
      * @param charset  The charset to use
      */
-    void send(final String data, final Charset charset);
+    void send(String data, Charset charset);
 
 
     /**
@@ -110,14 +110,14 @@ public interface Sender {
      * @param channel the file channel to transfer
      * @param callback The callback
      */
-    void transferFrom(final FileChannel channel, final IoCallback callback);
+    void transferFrom(FileChannel channel, IoCallback callback);
 
     /**
      * Closes this sender asynchronously. The given callback is notified on completion
      *
      * @param callback The callback that is notified when all data has been flushed and the channel is closed
      */
-    void close(final IoCallback callback);
+    void close(IoCallback callback);
 
     /**
      * Closes this sender asynchronously
diff --git a/core/src/main/java/io/undertow/predicate/Predicate.java b/core/src/main/java/io/undertow/predicate/Predicate.java
index 2f2d11cf1b..461b401b2b 100644
--- a/core/src/main/java/io/undertow/predicate/Predicate.java
+++ b/core/src/main/java/io/undertow/predicate/Predicate.java
@@ -44,6 +44,6 @@ public interface Predicate {
      */
     AttachmentKey<Map<String, Object>> PREDICATE_CONTEXT = AttachmentKey.create(Map.class);
 
-    boolean resolve(final HttpServerExchange value);
+    boolean resolve(HttpServerExchange value);
 
 }
diff --git a/core/src/main/java/io/undertow/predicate/PredicateBuilder.java b/core/src/main/java/io/undertow/predicate/PredicateBuilder.java
index 4d287431dd..2632d3d450 100644
--- a/core/src/main/java/io/undertow/predicate/PredicateBuilder.java
+++ b/core/src/main/java/io/undertow/predicate/PredicateBuilder.java
@@ -60,7 +60,7 @@ public interface PredicateBuilder {
      * @param config The predicate config
      * @return The new predicate
      */
-    Predicate build(final Map<String, Object> config);
+    Predicate build(Map<String, Object> config);
 
     /**
      * The priority of the builder. Builders will be tried in priority builder. Built in builders use the priority range 0-100.
diff --git a/core/src/main/java/io/undertow/predicate/ip/IPMatchBase.java b/core/src/main/java/io/undertow/predicate/ip/IPMatchBase.java
index b30c6626be..869afd907e 100644
--- a/core/src/main/java/io/undertow/predicate/ip/IPMatchBase.java
+++ b/core/src/main/java/io/undertow/predicate/ip/IPMatchBase.java
@@ -284,7 +284,7 @@ protected PeerMatch(final String pattern, final boolean deny) {
             this.deny = deny;
         }
 
-        public abstract boolean matches(final InetAddress address);
+        public abstract boolean matches(InetAddress address);
 
         public boolean isDeny() {
             return this.deny;
diff --git a/core/src/main/java/io/undertow/security/api/AuthenticatedSessionManager.java b/core/src/main/java/io/undertow/security/api/AuthenticatedSessionManager.java
index 56ef76447a..ecc43d2654 100644
--- a/core/src/main/java/io/undertow/security/api/AuthenticatedSessionManager.java
+++ b/core/src/main/java/io/undertow/security/api/AuthenticatedSessionManager.java
@@ -36,7 +36,7 @@ public interface AuthenticatedSessionManager {
      */
     AttachmentKey<AuthenticatedSessionManager> ATTACHMENT_KEY = AttachmentKey.create(AuthenticatedSessionManager.class);
 
-    AuthenticatedSession lookupSession(final HttpServerExchange exchange);
+    AuthenticatedSession lookupSession(HttpServerExchange exchange);
 
     void clearSession(HttpServerExchange exchange);
 
diff --git a/core/src/main/java/io/undertow/security/api/AuthenticationMechanism.java b/core/src/main/java/io/undertow/security/api/AuthenticationMechanism.java
index 159e1df5f1..9c6c5b03ff 100644
--- a/core/src/main/java/io/undertow/security/api/AuthenticationMechanism.java
+++ b/core/src/main/java/io/undertow/security/api/AuthenticationMechanism.java
@@ -64,8 +64,8 @@ public interface AuthenticationMechanism {
      * @param exchange The exchange
      * @return
      */
-    AuthenticationMechanismOutcome authenticate(final HttpServerExchange exchange,
-                                                final SecurityContext securityContext);
+    AuthenticationMechanismOutcome authenticate(HttpServerExchange exchange,
+                                                SecurityContext securityContext);
 
     /**
      * Send an authentication challenge to the remote client.
@@ -80,7 +80,7 @@ AuthenticationMechanismOutcome authenticate(final HttpServerExchange exchange,
      * @param securityContext The security context
      * @return A {@link ChallengeResult} indicating if a challenge was sent and the desired response code.
      */
-    ChallengeResult sendChallenge(final HttpServerExchange exchange, final SecurityContext securityContext);
+    ChallengeResult sendChallenge(HttpServerExchange exchange, SecurityContext securityContext);
 
     /**
      * The AuthenticationOutcome is used by an AuthenticationMechanism to indicate the outcome of the call to authenticate, the
diff --git a/core/src/main/java/io/undertow/security/api/GSSAPIServerSubjectFactory.java b/core/src/main/java/io/undertow/security/api/GSSAPIServerSubjectFactory.java
index 9bae288f93..2bb61d8936 100644
--- a/core/src/main/java/io/undertow/security/api/GSSAPIServerSubjectFactory.java
+++ b/core/src/main/java/io/undertow/security/api/GSSAPIServerSubjectFactory.java
@@ -46,6 +46,6 @@ public interface GSSAPIServerSubjectFactory {
      * @return The Subject to use for the specified host name or null if no match possible.
      * @throws GeneralSecurityException if there is a security failure obtaining the {@link Subject}
      */
-    Subject getSubjectForHost(final String hostName) throws GeneralSecurityException;
+    Subject getSubjectForHost(String hostName) throws GeneralSecurityException;
 
 }
diff --git a/core/src/main/java/io/undertow/security/api/NonceManager.java b/core/src/main/java/io/undertow/security/api/NonceManager.java
index b82c65de34..0f11022110 100644
--- a/core/src/main/java/io/undertow/security/api/NonceManager.java
+++ b/core/src/main/java/io/undertow/security/api/NonceManager.java
@@ -40,7 +40,7 @@ public interface NonceManager {
      * @param lastNonce - The last valid nonce received from the client or null if we don't already have a nonce.
      * @return The next nonce to be sent in a challenge to the client.
      */
-    String nextNonce(final String lastNonce, final HttpServerExchange exchange);
+    String nextNonce(String lastNonce, HttpServerExchange exchange);
 
     /**
      * Validate that a nonce can be used.
@@ -58,6 +58,6 @@ public interface NonceManager {
      * @param nonceCount - The nonce count from the client or -1 of none specified.
      * @return true if the nonce can be used otherwise return false.
      */
-    boolean validateNonce(final String nonce, final int nonceCount, final HttpServerExchange exchange);
+    boolean validateNonce(String nonce, int nonceCount, HttpServerExchange exchange);
 
 }
diff --git a/core/src/main/java/io/undertow/security/api/NotificationReceiver.java b/core/src/main/java/io/undertow/security/api/NotificationReceiver.java
index eec6b9c3ed..89e1dae2ca 100644
--- a/core/src/main/java/io/undertow/security/api/NotificationReceiver.java
+++ b/core/src/main/java/io/undertow/security/api/NotificationReceiver.java
@@ -37,6 +37,6 @@ public interface NotificationReceiver {
      *
      * @param notification
      */
-    void handleNotification(final SecurityNotification notification);
+    void handleNotification(SecurityNotification notification);
 
 }
diff --git a/core/src/main/java/io/undertow/security/api/SecurityContext.java b/core/src/main/java/io/undertow/security/api/SecurityContext.java
index 6408243df0..d1a248c275 100644
--- a/core/src/main/java/io/undertow/security/api/SecurityContext.java
+++ b/core/src/main/java/io/undertow/security/api/SecurityContext.java
@@ -162,7 +162,7 @@ public interface SecurityContext {
      * @param mechanismName - The name of the mechanism used to authenticate the account.
      * @param cachingRequired - If this mechanism requires caching
      */
-    void authenticationComplete(final Account account, final String mechanismName, final boolean cachingRequired);
+    void authenticationComplete(Account account, String mechanismName, boolean cachingRequired);
 
     /**
      * Called by the {@link AuthenticationMechanism} to indicate that an authentication attempt has failed.
@@ -176,7 +176,7 @@ public interface SecurityContext {
      * @param message - The message describing the failure.
      * @param mechanismName - The name of the mechanism reporting the failure.
      */
-    void authenticationFailed(final String message, final String mechanismName);
+    void authenticationFailed(String message, String mechanismName);
 
     /*
      * Methods for the management of NotificationHandler registrations.
@@ -187,7 +187,7 @@ public interface SecurityContext {
      *
      * @param receiver - The {@link NotificationReceiver} to register.
      */
-    void registerNotificationReceiver(final NotificationReceiver receiver);
+    void registerNotificationReceiver(NotificationReceiver receiver);
 
     /**
      * Remove a previously registered {@link NotificationReceiver} from this SecurityContext.
@@ -196,5 +196,5 @@ public interface SecurityContext {
      *
      * @param receiver - The {@link NotificationReceiver} to remove.
      */
-    void removeNotificationReceiver(final NotificationReceiver receiver);
+    void removeNotificationReceiver(NotificationReceiver receiver);
 }
diff --git a/core/src/main/java/io/undertow/security/api/SecurityContextFactory.java b/core/src/main/java/io/undertow/security/api/SecurityContextFactory.java
index 6f107a9cd6..34010026cc 100644
--- a/core/src/main/java/io/undertow/security/api/SecurityContextFactory.java
+++ b/core/src/main/java/io/undertow/security/api/SecurityContextFactory.java
@@ -42,6 +42,6 @@ public interface SecurityContextFactory {
      * @param programmaticMechName a {@code String} representing the programmatic mechanism name. Can be null.
      * @return the constructed {@code SecurityContext} instance.
      */
-    SecurityContext createSecurityContext(final HttpServerExchange exchange, final AuthenticationMode mode,
-        final IdentityManager identityManager, final String programmaticMechName);
+    SecurityContext createSecurityContext(HttpServerExchange exchange, AuthenticationMode mode,
+        IdentityManager identityManager, String programmaticMechName);
 }
diff --git a/core/src/main/java/io/undertow/security/api/SessionNonceManager.java b/core/src/main/java/io/undertow/security/api/SessionNonceManager.java
index 4034a755d0..20f3636ab9 100644
--- a/core/src/main/java/io/undertow/security/api/SessionNonceManager.java
+++ b/core/src/main/java/io/undertow/security/api/SessionNonceManager.java
@@ -34,7 +34,7 @@ public interface SessionNonceManager extends NonceManager {
      * @param nonce - The nonce the hash is to be associated with.
      * @param hash - The hash to associate.
      */
-    void associateHash(final String nonce, final byte[] hash);
+    void associateHash(String nonce, byte[] hash);
 
     /**
      * Retrieve the existing hash associated with the nonce specified.
@@ -44,6 +44,6 @@ public interface SessionNonceManager extends NonceManager {
      * @param nonce - The nonce the hash is required for.
      * @return The associated hash or null if there is no association.
      */
-    byte[] lookupHash(final String nonce);
+    byte[] lookupHash(String nonce);
 
 }
diff --git a/core/src/main/java/io/undertow/security/handlers/AbstractConfidentialityHandler.java b/core/src/main/java/io/undertow/security/handlers/AbstractConfidentialityHandler.java
index f223e12b3b..ad24124237 100644
--- a/core/src/main/java/io/undertow/security/handlers/AbstractConfidentialityHandler.java
+++ b/core/src/main/java/io/undertow/security/handlers/AbstractConfidentialityHandler.java
@@ -91,6 +91,6 @@ protected boolean confidentialityRequired(final HttpServerExchange exchange) {
      * @param exchange - The {@link HttpServerExchange} for the request being processed.
      * @return The {@link URI} to redirect to.
      */
-    protected abstract URI getRedirectURI(final HttpServerExchange exchange) throws URISyntaxException;
+    protected abstract URI getRedirectURI(HttpServerExchange exchange) throws URISyntaxException;
 
 }
diff --git a/core/src/main/java/io/undertow/security/handlers/AbstractSecurityContextAssociationHandler.java b/core/src/main/java/io/undertow/security/handlers/AbstractSecurityContextAssociationHandler.java
index 8380f0f959..47a147c36f 100644
--- a/core/src/main/java/io/undertow/security/handlers/AbstractSecurityContextAssociationHandler.java
+++ b/core/src/main/java/io/undertow/security/handlers/AbstractSecurityContextAssociationHandler.java
@@ -43,6 +43,6 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
         next.handleRequest(exchange);
     }
 
-    public abstract SecurityContext createSecurityContext(final HttpServerExchange exchange);
+    public abstract SecurityContext createSecurityContext(HttpServerExchange exchange);
 
 }
diff --git a/core/src/main/java/io/undertow/security/idm/DigestCredential.java b/core/src/main/java/io/undertow/security/idm/DigestCredential.java
index b67296a142..f5a5a0b74f 100644
--- a/core/src/main/java/io/undertow/security/idm/DigestCredential.java
+++ b/core/src/main/java/io/undertow/security/idm/DigestCredential.java
@@ -42,7 +42,7 @@ public interface DigestCredential extends Credential {
      * @param ha1 - The hex encoded a1 value.
      * @return true if verification was successful, false otherwise.
      */
-    boolean verifyHA1(final byte[] ha1);
+    boolean verifyHA1(byte[] ha1);
 
     /**
      * Get the realm name the credential is being validated against.
diff --git a/core/src/main/java/io/undertow/security/idm/IdentityManager.java b/core/src/main/java/io/undertow/security/idm/IdentityManager.java
index 3df7ef02d7..9d586f9783 100644
--- a/core/src/main/java/io/undertow/security/idm/IdentityManager.java
+++ b/core/src/main/java/io/undertow/security/idm/IdentityManager.java
@@ -38,7 +38,7 @@ public interface IdentityManager {
      * @param account - The {@link Account} to verify.
      * @return An updates {@link Account} if verification is successful, null otherwise.
      */
-    Account verify(final Account account);
+    Account verify(Account account);
 
     /**
      * Verify a supplied {@link Credential} against a requested ID.
@@ -47,7 +47,7 @@ public interface IdentityManager {
      * @param credential - The {@link Credential} to verify.
      * @return The {@link Account} for the user if verification was successful, null otherwise.
      */
-    Account verify(final String id, final Credential credential);
+    Account verify(String id, Credential credential);
 
     /**
      * Perform verification when all we have is the Credential, in this case the IdentityManager is also responsible for mapping the Credential to an account.
@@ -57,6 +57,6 @@ public interface IdentityManager {
      * @param credential
      * @return
      */
-    Account verify(final Credential credential);
+    Account verify(Credential credential);
 
 }
diff --git a/core/src/main/java/io/undertow/server/ConduitWrapper.java b/core/src/main/java/io/undertow/server/ConduitWrapper.java
index 99420abe8d..7393900cdd 100644
--- a/core/src/main/java/io/undertow/server/ConduitWrapper.java
+++ b/core/src/main/java/io/undertow/server/ConduitWrapper.java
@@ -39,5 +39,5 @@ public interface ConduitWrapper<T extends Conduit> {
      * @param exchange the in-flight HTTP exchange
      * @return the replacement conduit
      */
-    T wrap(final ConduitFactory<T> factory, final HttpServerExchange exchange);
+    T wrap(ConduitFactory<T> factory, HttpServerExchange exchange);
 }
diff --git a/core/src/main/java/io/undertow/server/DefaultResponseListener.java b/core/src/main/java/io/undertow/server/DefaultResponseListener.java
index a9652d843b..265af1d6c3 100644
--- a/core/src/main/java/io/undertow/server/DefaultResponseListener.java
+++ b/core/src/main/java/io/undertow/server/DefaultResponseListener.java
@@ -39,5 +39,5 @@ public interface DefaultResponseListener {
      * @param exchange The exchange
      * @return true if this listener is generating a default response.
      */
-    boolean handleDefaultResponse(final HttpServerExchange exchange);
+    boolean handleDefaultResponse(HttpServerExchange exchange);
 }
diff --git a/core/src/main/java/io/undertow/server/DelegateOpenListener.java b/core/src/main/java/io/undertow/server/DelegateOpenListener.java
index e8af6490f8..d780a421d4 100644
--- a/core/src/main/java/io/undertow/server/DelegateOpenListener.java
+++ b/core/src/main/java/io/undertow/server/DelegateOpenListener.java
@@ -33,5 +33,5 @@ public interface DelegateOpenListener extends OpenListener {
      * @param channel The channel
      * @param additionalData Any additional data that was read from the stream as part of the handshake process
      */
-    void handleEvent(final StreamConnection channel, PooledByteBuffer additionalData);
+    void handleEvent(StreamConnection channel, PooledByteBuffer additionalData);
 }
diff --git a/core/src/main/java/io/undertow/server/ExchangeCompletionListener.java b/core/src/main/java/io/undertow/server/ExchangeCompletionListener.java
index 57fba44fb0..5d3f055e6f 100644
--- a/core/src/main/java/io/undertow/server/ExchangeCompletionListener.java
+++ b/core/src/main/java/io/undertow/server/ExchangeCompletionListener.java
@@ -35,7 +35,7 @@
  */
 public interface ExchangeCompletionListener {
 
-    void exchangeEvent(final HttpServerExchange exchange, final NextListener nextListener);
+    void exchangeEvent(HttpServerExchange exchange, NextListener nextListener);
 
     interface NextListener {
 
diff --git a/core/src/main/java/io/undertow/server/HttpUpgradeListener.java b/core/src/main/java/io/undertow/server/HttpUpgradeListener.java
index 42248e2e1f..bf0b075821 100644
--- a/core/src/main/java/io/undertow/server/HttpUpgradeListener.java
+++ b/core/src/main/java/io/undertow/server/HttpUpgradeListener.java
@@ -33,6 +33,6 @@ public interface HttpUpgradeListener {
      * @param streamConnection The connection that can be used to send or receive data
      * @param exchange
      */
-    void handleUpgrade(final StreamConnection streamConnection, HttpServerExchange exchange);
+    void handleUpgrade(StreamConnection streamConnection, HttpServerExchange exchange);
 
 }
diff --git a/core/src/main/java/io/undertow/server/ServerConnection.java b/core/src/main/java/io/undertow/server/ServerConnection.java
index 441197d033..a61a93e577 100644
--- a/core/src/main/java/io/undertow/server/ServerConnection.java
+++ b/core/src/main/java/io/undertow/server/ServerConnection.java
@@ -217,7 +217,7 @@ public SSLSession getSslSession() {
      *
      * @return The source conduit
      */
-    protected abstract StreamSinkConduit getSinkConduit(HttpServerExchange exchange, final StreamSinkConduit conduit);
+    protected abstract StreamSinkConduit getSinkConduit(HttpServerExchange exchange, StreamSinkConduit conduit);
 
     /**
      *
@@ -297,6 +297,6 @@ public boolean isPushSupported() {
 
     public interface CloseListener {
 
-        void closed(final ServerConnection connection);
+        void closed(ServerConnection connection);
     }
 }
diff --git a/core/src/main/java/io/undertow/server/handlers/Cookie.java b/core/src/main/java/io/undertow/server/handlers/Cookie.java
index e1a4773024..5b2a0e552f 100644
--- a/core/src/main/java/io/undertow/server/handlers/Cookie.java
+++ b/core/src/main/java/io/undertow/server/handlers/Cookie.java
@@ -32,43 +32,43 @@ public interface Cookie extends Comparable {
 
     String getValue();
 
-    Cookie setValue(final String value);
+    Cookie setValue(String value);
 
     String getPath();
 
-    Cookie setPath(final String path);
+    Cookie setPath(String path);
 
     String getDomain();
 
-    Cookie setDomain(final String domain);
+    Cookie setDomain(String domain);
 
     Integer getMaxAge();
 
-    Cookie setMaxAge(final Integer maxAge);
+    Cookie setMaxAge(Integer maxAge);
 
     boolean isDiscard();
 
-    Cookie setDiscard(final boolean discard);
+    Cookie setDiscard(boolean discard);
 
     boolean isSecure();
 
-    Cookie setSecure(final boolean secure);
+    Cookie setSecure(boolean secure);
 
     int getVersion();
 
-    Cookie setVersion(final int version);
+    Cookie setVersion(int version);
 
     boolean isHttpOnly();
 
-    Cookie setHttpOnly(final boolean httpOnly);
+    Cookie setHttpOnly(boolean httpOnly);
 
     Date getExpires();
 
-    Cookie setExpires(final Date expires);
+    Cookie setExpires(Date expires);
 
     String getComment();
 
-    Cookie setComment(final String comment);
+    Cookie setComment(String comment);
 
     default boolean isSameSite() {
         return false;
diff --git a/core/src/main/java/io/undertow/server/handlers/HttpUpgradeHandshake.java b/core/src/main/java/io/undertow/server/handlers/HttpUpgradeHandshake.java
index 8d23946339..00bf9d9c37 100644
--- a/core/src/main/java/io/undertow/server/handlers/HttpUpgradeHandshake.java
+++ b/core/src/main/java/io/undertow/server/handlers/HttpUpgradeHandshake.java
@@ -42,6 +42,6 @@ public interface HttpUpgradeHandshake {
      * @return <code>true</code> if the handshake is valid and should be upgraded. False if it is invalid
      * @throws IOException If the handshake is invalid
      */
-    boolean handleUpgrade(final HttpServerExchange exchange) throws IOException;
+    boolean handleUpgrade(HttpServerExchange exchange) throws IOException;
 
 }
diff --git a/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogReceiver.java b/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogReceiver.java
index c0a8f0d3e8..58b1a01ed4 100644
--- a/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogReceiver.java
+++ b/core/src/main/java/io/undertow/server/handlers/accesslog/AccessLogReceiver.java
@@ -27,6 +27,6 @@
  */
 public interface AccessLogReceiver {
 
-    void logMessage(final String message);
+    void logMessage(String message);
 
 }
diff --git a/core/src/main/java/io/undertow/server/handlers/builder/HandlerBuilder.java b/core/src/main/java/io/undertow/server/handlers/builder/HandlerBuilder.java
index e4318df150..ff28c28c01 100644
--- a/core/src/main/java/io/undertow/server/handlers/builder/HandlerBuilder.java
+++ b/core/src/main/java/io/undertow/server/handlers/builder/HandlerBuilder.java
@@ -57,7 +57,7 @@ public interface HandlerBuilder {
      * @param config The handler config
      * @return The new predicate
      */
-    HandlerWrapper build(final Map<String, Object> config);
+    HandlerWrapper build(Map<String, Object> config);
 
     /**
      * The priority of the builder. Builders will be tried in priority builder. Built in builders use the priority range 0-100.
diff --git a/core/src/main/java/io/undertow/server/handlers/form/FormDataParser.java b/core/src/main/java/io/undertow/server/handlers/form/FormDataParser.java
index c9c1c1a614..f8dd054b52 100644
--- a/core/src/main/java/io/undertow/server/handlers/form/FormDataParser.java
+++ b/core/src/main/java/io/undertow/server/handlers/form/FormDataParser.java
@@ -49,7 +49,7 @@ public interface FormDataParser extends Closeable {
      * The method can either invoke the next handler directly, or may delegate to the IO thread
      * to perform the parsing.
      */
-    void parse(final HttpHandler next) throws Exception;
+    void parse(HttpHandler next) throws Exception;
 
     /**
      * Parse the data, blocking the current thread until parsing is complete. For blocking handlers this method is
diff --git a/core/src/main/java/io/undertow/server/handlers/form/FormParserFactory.java b/core/src/main/java/io/undertow/server/handlers/form/FormParserFactory.java
index 90f4e77690..5038188872 100644
--- a/core/src/main/java/io/undertow/server/handlers/form/FormParserFactory.java
+++ b/core/src/main/java/io/undertow/server/handlers/form/FormParserFactory.java
@@ -67,7 +67,7 @@ public FormDataParser createParser(final HttpServerExchange exchange) {
 
     public interface ParserDefinition<T> {
 
-        FormDataParser create(final HttpServerExchange exchange);
+        FormDataParser create(HttpServerExchange exchange);
 
         T setDefaultEncoding(String charset);
     }
diff --git a/core/src/main/java/io/undertow/server/handlers/proxy/ProxyCallback.java b/core/src/main/java/io/undertow/server/handlers/proxy/ProxyCallback.java
index aedb445f20..9c881eb333 100644
--- a/core/src/main/java/io/undertow/server/handlers/proxy/ProxyCallback.java
+++ b/core/src/main/java/io/undertow/server/handlers/proxy/ProxyCallback.java
@@ -27,21 +27,21 @@
  */
 public interface ProxyCallback<T> {
 
-    void completed(final HttpServerExchange exchange, T result);
+    void completed(HttpServerExchange exchange, T result);
 
     /**
      * Callback if establishing the connection to a backend server fails.
      *
      * @param exchange    the http server exchange
      */
-    void failed(final HttpServerExchange exchange);
+    void failed(HttpServerExchange exchange);
 
     /**
      * Callback if no backend server could be found.
      *
      * @param exchange    the http server exchange
      */
-    void couldNotResolveBackend(final HttpServerExchange exchange);
+    void couldNotResolveBackend(HttpServerExchange exchange);
 
     /**
      * This is invoked when the target connection pool transitions to problem status. It will be called once for each queued request
diff --git a/core/src/main/java/io/undertow/server/handlers/proxy/ProxyClient.java b/core/src/main/java/io/undertow/server/handlers/proxy/ProxyClient.java
index b86027eb3c..95f132d445 100644
--- a/core/src/main/java/io/undertow/server/handlers/proxy/ProxyClient.java
+++ b/core/src/main/java/io/undertow/server/handlers/proxy/ProxyClient.java
@@ -48,7 +48,7 @@ public interface ProxyClient {
      * @param exchange The exchange
      * @return The proxy target
      */
-    ProxyTarget findTarget(final HttpServerExchange exchange);
+    ProxyTarget findTarget(HttpServerExchange exchange);
 
     /**
      * Gets a proxy connection for the given request.
@@ -58,7 +58,7 @@ public interface ProxyClient {
      * @param timeout The timeout
      * @param timeUnit Time unit for the timeout
      */
-    void getConnection(final ProxyTarget target, final HttpServerExchange exchange, final ProxyCallback<ProxyConnection> callback, long timeout, TimeUnit timeUnit);
+    void getConnection(ProxyTarget target, HttpServerExchange exchange, ProxyCallback<ProxyConnection> callback, long timeout, TimeUnit timeUnit);
 
     /**
      * An opaque interface that may contain information about the proxy target
diff --git a/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/NodeHealthChecker.java b/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/NodeHealthChecker.java
index ebb11c4217..e9d013dc87 100644
--- a/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/NodeHealthChecker.java
+++ b/core/src/main/java/io/undertow/server/handlers/proxy/mod_cluster/NodeHealthChecker.java
@@ -31,7 +31,7 @@ public interface NodeHealthChecker {
      * @param response the client response
      * @return true if the response from the node is healthy
      */
-    boolean checkResponse(final ClientResponse response);
+    boolean checkResponse(ClientResponse response);
 
     /**
      * Receiving a response is a success.
diff --git a/core/src/main/java/io/undertow/server/handlers/resource/RangeAwareResource.java b/core/src/main/java/io/undertow/server/handlers/resource/RangeAwareResource.java
index c24093275f..084f51d2fb 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/RangeAwareResource.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/RangeAwareResource.java
@@ -36,7 +36,7 @@ public interface RangeAwareResource extends Resource {
      * @param sender The sender to use.
      * @param exchange The exchange
      */
-    void serveRange(final Sender sender, final HttpServerExchange exchange, long start, long end, final IoCallback completionCallback);
+    void serveRange(Sender sender, HttpServerExchange exchange, long start, long end, IoCallback completionCallback);
 
     /**
      * It is possible that some resources managers may only support range requests on a subset of their resources,
diff --git a/core/src/main/java/io/undertow/server/handlers/resource/Resource.java b/core/src/main/java/io/undertow/server/handlers/resource/Resource.java
index 73a76fc0b9..b0885354ec 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/Resource.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/Resource.java
@@ -78,7 +78,7 @@ public interface Resource {
      * mime mappings, however in some cases the resource may have additional information as
      * to the actual content type.
      */
-    String getContentType(final MimeMappings mimeMappings);
+    String getContentType(MimeMappings mimeMappings);
 
     /**
      * Serve the resource, and call the provided callback when complete.
@@ -86,7 +86,7 @@ public interface Resource {
      * @param sender The sender to use.
      * @param exchange The exchange
      */
-    void serve(final Sender sender, final HttpServerExchange exchange, final IoCallback completionCallback);
+    void serve(Sender sender, HttpServerExchange exchange, IoCallback completionCallback);
 
     /**
      * @return The content length, or null if it is unknown
diff --git a/core/src/main/java/io/undertow/server/handlers/resource/ResourceChangeListener.java b/core/src/main/java/io/undertow/server/handlers/resource/ResourceChangeListener.java
index 9a1c3b71c4..cda1df728e 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/ResourceChangeListener.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/ResourceChangeListener.java
@@ -31,6 +31,6 @@ public interface ResourceChangeListener {
      * callback that is invoked when resources change.
      * @param changes The collection of changes
      */
-    void handleChanges(final Collection<ResourceChangeEvent> changes);
+    void handleChanges(Collection<ResourceChangeEvent> changes);
 
 }
diff --git a/core/src/main/java/io/undertow/server/handlers/resource/ResourceManager.java b/core/src/main/java/io/undertow/server/handlers/resource/ResourceManager.java
index eb40d06c0a..25d2186598 100644
--- a/core/src/main/java/io/undertow/server/handlers/resource/ResourceManager.java
+++ b/core/src/main/java/io/undertow/server/handlers/resource/ResourceManager.java
@@ -40,7 +40,7 @@ public interface ResourceManager extends Closeable {
      * @param path The path
      * @return The resource representing the path, or null if no resource was found.
      */
-    Resource getResource(final String path) throws IOException;
+    Resource getResource(String path) throws IOException;
 
     /**
      *
@@ -53,13 +53,13 @@ public interface ResourceManager extends Closeable {
      * @param listener The listener to register
      * @throws IllegalArgumentException If resource change listeners are not supported
      */
-    void registerResourceChangeListener(final ResourceChangeListener listener);
+    void registerResourceChangeListener(ResourceChangeListener listener);
 
     /**
      * Removes a resource change listener
      * @param listener
      */
-    void removeResourceChangeListener(final ResourceChangeListener listener);
+    void removeResourceChangeListener(ResourceChangeListener listener);
 
     ResourceManager EMPTY_RESOURCE_MANAGER = new ResourceManager() {
         @Override
diff --git a/core/src/main/java/io/undertow/server/protocol/framed/FramePriority.java b/core/src/main/java/io/undertow/server/protocol/framed/FramePriority.java
index e94f706836..1493f5d126 100644
--- a/core/src/main/java/io/undertow/server/protocol/framed/FramePriority.java
+++ b/core/src/main/java/io/undertow/server/protocol/framed/FramePriority.java
@@ -45,7 +45,7 @@ public interface FramePriority<C extends AbstractFramedChannel<C, R, S>, R exten
      * @param pendingFrames The pending frame list
      * @return true if the frame can be inserted into the pending frame list
      */
-    boolean insertFrame(S newFrame, final List<S> pendingFrames);
+    boolean insertFrame(S newFrame, List<S> pendingFrames);
 
     /**
      * Invoked when a new frame is successfully added to the pending frames queue.
@@ -60,6 +60,6 @@ public interface FramePriority<C extends AbstractFramedChannel<C, R, S>, R exten
      * @param pendingFrames The pending frame queue
      * @param holdFrames The held frame queue
      */
-    void frameAdded(S addedFrame, final List<S> pendingFrames, final Deque<S> holdFrames);
+    void frameAdded(S addedFrame, List<S> pendingFrames, Deque<S> holdFrames);
 
 }
diff --git a/core/src/main/java/io/undertow/server/protocol/http/HttpContinue.java b/core/src/main/java/io/undertow/server/protocol/http/HttpContinue.java
index b443c27b09..ceb6776f43 100644
--- a/core/src/main/java/io/undertow/server/protocol/http/HttpContinue.java
+++ b/core/src/main/java/io/undertow/server/protocol/http/HttpContinue.java
@@ -269,7 +269,7 @@ public interface ContinueResponseSender {
 
         void awaitWritable() throws IOException;
 
-        void awaitWritable(long time, final TimeUnit timeUnit) throws IOException;
+        void awaitWritable(long time, TimeUnit timeUnit) throws IOException;
 
     }
 
diff --git a/core/src/main/java/io/undertow/server/protocol/http/HttpRequestParser.java b/core/src/main/java/io/undertow/server/protocol/http/HttpRequestParser.java
index 6a6ff83e3e..a90c20706a 100644
--- a/core/src/main/java/io/undertow/server/protocol/http/HttpRequestParser.java
+++ b/core/src/main/java/io/undertow/server/protocol/http/HttpRequestParser.java
@@ -372,11 +372,11 @@ private void sanitazeListTypeHeaders(final HttpServerExchange builder) {
         //TODO: list type headers?
     }
 
-    abstract void handleHttpVerb(ByteBuffer buffer, final ParseState currentState, final HttpServerExchange builder) throws BadRequestException;
+    abstract void handleHttpVerb(ByteBuffer buffer, ParseState currentState, HttpServerExchange builder) throws BadRequestException;
 
-    abstract void handleHttpVersion(ByteBuffer buffer, final ParseState currentState, final HttpServerExchange builder) throws BadRequestException;
+    abstract void handleHttpVersion(ByteBuffer buffer, ParseState currentState, HttpServerExchange builder) throws BadRequestException;
 
-    abstract void handleHeader(ByteBuffer buffer, final ParseState currentState, final HttpServerExchange builder) throws BadRequestException;
+    abstract void handleHeader(ByteBuffer buffer, ParseState currentState, HttpServerExchange builder) throws BadRequestException;
 
     /**
      * The parse states for parsing the path.
diff --git a/core/src/main/java/io/undertow/server/session/Session.java b/core/src/main/java/io/undertow/server/session/Session.java
index f02a3a7e8d..e1f33917e0 100644
--- a/core/src/main/java/io/undertow/server/session/Session.java
+++ b/core/src/main/java/io/undertow/server/session/Session.java
@@ -51,7 +51,7 @@ public interface Session {
      *
      * @param serverExchange The http server exchange for this request
      */
-    void requestDone(final HttpServerExchange serverExchange);
+    void requestDone(HttpServerExchange serverExchange);
 
     /**
      * Returns the time when this session was created, measured
@@ -150,7 +150,7 @@ public interface Session {
      * @return An IOFuture containing the previous value
      * @throws IllegalStateException if this method is called on an invalidated session
      */
-    Object setAttribute(final String name, Object value);
+    Object setAttribute(String name, Object value);
 
     /**
      * Removes the object bound with the specified name from
@@ -161,7 +161,7 @@ public interface Session {
      * @throws IllegalStateException if this method is called on an
      *                               invalidated session
      */
-    Object removeAttribute(final String name);
+    Object removeAttribute(String name);
 
     /**
      * Invalidates this session then unbinds any objects bound
@@ -170,7 +170,7 @@ public interface Session {
      * @throws IllegalStateException if this method is called on an
      *                               already invalidated session
      */
-    void invalidate(final HttpServerExchange exchange);
+    void invalidate(HttpServerExchange exchange);
 
     /**
      * @return The session manager that is associated with this session
@@ -182,7 +182,7 @@ public interface Session {
      *
      * @return The new session ID
      */
-    String changeSessionId(final HttpServerExchange exchange, final SessionConfig config);
+    String changeSessionId(HttpServerExchange exchange, SessionConfig config);
 
     /**
      * Return state of session. NOTE: this method does not take into account if process of invalidation start.
diff --git a/core/src/main/java/io/undertow/server/session/SessionConfig.java b/core/src/main/java/io/undertow/server/session/SessionConfig.java
index e2c941abd6..57ac518953 100644
--- a/core/src/main/java/io/undertow/server/session/SessionConfig.java
+++ b/core/src/main/java/io/undertow/server/session/SessionConfig.java
@@ -48,7 +48,7 @@ public interface SessionConfig {
      * @param exchange The exchange
      * @param sessionId  The session
      */
-    void setSessionId(final HttpServerExchange exchange, final String sessionId);
+    void setSessionId(HttpServerExchange exchange, String sessionId);
 
     /**
      * Clears this session from the exchange, removing the attachment and making any changes to the response necessary,
@@ -57,7 +57,7 @@ public interface SessionConfig {
      * @param exchange The exchange
      * @param sessionId  The session id
      */
-    void clearSession(final HttpServerExchange exchange, final String sessionId);
+    void clearSession(HttpServerExchange exchange, String sessionId);
 
     /**
      * Retrieves a session id of an existing session from an exchange.
@@ -65,11 +65,11 @@ public interface SessionConfig {
      * @param exchange The exchange
      * @return The session id, or null
      */
-    String findSessionId(final HttpServerExchange exchange);
+    String findSessionId(HttpServerExchange exchange);
 
-    SessionCookieSource sessionCookieSource(final HttpServerExchange exchange);
+    SessionCookieSource sessionCookieSource(HttpServerExchange exchange);
 
-    String rewriteUrl(final String originalUrl, final String sessionId);
+    String rewriteUrl(String originalUrl, String sessionId);
 
     enum SessionCookieSource {
         URL,
diff --git a/core/src/main/java/io/undertow/server/session/SessionManager.java b/core/src/main/java/io/undertow/server/session/SessionManager.java
index 3ff6f34382..c79032090d 100644
--- a/core/src/main/java/io/undertow/server/session/SessionManager.java
+++ b/core/src/main/java/io/undertow/server/session/SessionManager.java
@@ -74,12 +74,12 @@ public interface SessionManager {
      *
      * @return The created session
      */
-    Session createSession(final HttpServerExchange serverExchange, final SessionConfig sessionCookieConfig);
+    Session createSession(HttpServerExchange serverExchange, SessionConfig sessionCookieConfig);
 
     /**
      * @return An IoFuture that can be used to retrieve the session, or an IoFuture that will return null if not found
      */
-    Session getSession(final HttpServerExchange serverExchange, final SessionConfig sessionCookieConfig);
+    Session getSession(HttpServerExchange serverExchange, SessionConfig sessionCookieConfig);
 
     /**
      * Retrieves a session with the given session id
@@ -87,28 +87,28 @@ public interface SessionManager {
      * @param sessionId The session ID
      * @return The session, or null if it does not exist
      */
-    Session getSession(final String sessionId);
+    Session getSession(String sessionId);
 
     /**
      * Registers a session listener for the session manager
      *
      * @param listener The listener
      */
-    void registerSessionListener(final SessionListener listener);
+    void registerSessionListener(SessionListener listener);
 
     /**
      * Removes a session listener from the session manager
      *
      * @param listener the listener
      */
-    void removeSessionListener(final SessionListener listener);
+    void removeSessionListener(SessionListener listener);
 
     /**
      * Sets the default session timeout
      *
      * @param timeout the timeout
      */
-    void setDefaultSessionTimeout(final int timeout);
+    void setDefaultSessionTimeout(int timeout);
 
     /**
      * Returns the identifiers of those sessions that would be lost upon
diff --git a/core/src/main/java/io/undertow/util/MultipartParser.java b/core/src/main/java/io/undertow/util/MultipartParser.java
index 66cea0eea1..150db9fcb2 100644
--- a/core/src/main/java/io/undertow/util/MultipartParser.java
+++ b/core/src/main/java/io/undertow/util/MultipartParser.java
@@ -66,9 +66,9 @@ public class MultipartParser {
     private static final byte[] BOUNDARY_PREFIX = {CR, LF, DASH, DASH};
 
     public interface PartHandler {
-        void beginPart(final HeaderMap headers);
+        void beginPart(HeaderMap headers);
 
-        void data(final ByteBuffer buffer) throws IOException;
+        void data(ByteBuffer buffer) throws IOException;
 
         void endPart();
     }
@@ -355,7 +355,7 @@ public boolean isComplete() {
 
 
     private interface Encoding {
-        void handle(final PartHandler handler, final ByteBuffer rawData) throws IOException;
+        void handle(PartHandler handler, ByteBuffer rawData) throws IOException;
     }
 
     private static class IdentityEncoding implements Encoding {
diff --git a/core/src/main/java/io/undertow/util/URLUtils.java b/core/src/main/java/io/undertow/util/URLUtils.java
index 18d49b3050..904d9c0844 100644
--- a/core/src/main/java/io/undertow/util/URLUtils.java
+++ b/core/src/main/java/io/undertow/util/URLUtils.java
@@ -302,7 +302,7 @@ private String decode(String charset, String attrName, final boolean doDecode) t
             return attrName;
         }
 
-        abstract void handle(final HttpServerExchange exchange, final String key, final String value);
+        abstract void handle(HttpServerExchange exchange, String key, String value);
     }
 
 
diff --git a/core/src/main/java/io/undertow/websockets/client/WebSocketClientHandshake.java b/core/src/main/java/io/undertow/websockets/client/WebSocketClientHandshake.java
index e1b58c4782..b5e15e0985 100644
--- a/core/src/main/java/io/undertow/websockets/client/WebSocketClientHandshake.java
+++ b/core/src/main/java/io/undertow/websockets/client/WebSocketClientHandshake.java
@@ -54,11 +54,11 @@ public WebSocketClientHandshake(final URI url) {
         this.url = url;
     }
 
-    public abstract WebSocketChannel createChannel(final StreamConnection channel, final String wsUri, final ByteBufferPool bufferPool, OptionMap options);
+    public abstract WebSocketChannel createChannel(StreamConnection channel, String wsUri, ByteBufferPool bufferPool, OptionMap options);
 
     public abstract Map<String, String> createHeaders();
 
-    public abstract ExtendedHandshakeChecker handshakeChecker(final URI uri, final Map<String, List<String>> requestHeaders);
+    public abstract ExtendedHandshakeChecker handshakeChecker(URI uri, Map<String, List<String>> requestHeaders);
 
 
 }
diff --git a/core/src/main/java/io/undertow/websockets/core/WebSocketCallback.java b/core/src/main/java/io/undertow/websockets/core/WebSocketCallback.java
index 4dfc461edd..dfae846fa9 100644
--- a/core/src/main/java/io/undertow/websockets/core/WebSocketCallback.java
+++ b/core/src/main/java/io/undertow/websockets/core/WebSocketCallback.java
@@ -23,8 +23,8 @@
  */
 public interface WebSocketCallback<T> {
 
-    void complete(final WebSocketChannel channel, T context);
+    void complete(WebSocketChannel channel, T context);
 
-    void onError(final WebSocketChannel channel, T context, Throwable throwable);
+    void onError(WebSocketChannel channel, T context, Throwable throwable);
 
 }
diff --git a/core/src/main/java/io/undertow/websockets/core/WebSocketChannel.java b/core/src/main/java/io/undertow/websockets/core/WebSocketChannel.java
index 7b0c3b568a..7f17edf79d 100644
--- a/core/src/main/java/io/undertow/websockets/core/WebSocketChannel.java
+++ b/core/src/main/java/io/undertow/websockets/core/WebSocketChannel.java
@@ -444,7 +444,7 @@ public interface PartialFrame extends FrameHeaderData {
         /**
          * @return The channel, or null if the channel is not available yet
          */
-        StreamSourceFrameChannel getChannel(final PooledByteBuffer data);
+        StreamSourceFrameChannel getChannel(PooledByteBuffer data);
 
         /**
          * Handles the data, any remaining data will be pushed back
diff --git a/core/src/main/java/io/undertow/websockets/core/WebSocketMessages.java b/core/src/main/java/io/undertow/websockets/core/WebSocketMessages.java
index 491a33f0e0..eb35c43f4e 100644
--- a/core/src/main/java/io/undertow/websockets/core/WebSocketMessages.java
+++ b/core/src/main/java/io/undertow/websockets/core/WebSocketMessages.java
@@ -167,7 +167,7 @@ public interface WebSocketMessages {
 //    IllegalStateException badExtensionsConfiguredInClient();
 
     @Message(id = 2044, value = "Compressed message payload is corrupted")
-    IOException badCompressedPayload(@Cause final DataFormatException cause);
+    IOException badCompressedPayload(@Cause DataFormatException cause);
 
     @Message(id = 2045, value = "Unable to send on newly created channel!")
     IllegalStateException unableToSendOnNewChannel();
diff --git a/core/src/main/java/io/undertow/websockets/core/protocol/Handshake.java b/core/src/main/java/io/undertow/websockets/core/protocol/Handshake.java
index c26dd808b9..381580c5fe 100644
--- a/core/src/main/java/io/undertow/websockets/core/protocol/Handshake.java
+++ b/core/src/main/java/io/undertow/websockets/core/protocol/Handshake.java
@@ -102,7 +102,7 @@ public final void handshake(final WebSocketHttpExchange exchange) {
         handshakeInternal(exchange);
     }
 
-    protected abstract void handshakeInternal(final WebSocketHttpExchange exchange);
+    protected abstract void handshakeInternal(WebSocketHttpExchange exchange);
 
     /**
      * Return {@code true} if this implementation can be used to issue a handshake.
@@ -112,7 +112,7 @@ public final void handshake(final WebSocketHttpExchange exchange) {
     /**
      * Create the {@link WebSocketChannel} from the {@link WebSocketHttpExchange}
      */
-    public abstract WebSocketChannel createChannel(WebSocketHttpExchange exchange, final StreamConnection channel, final ByteBufferPool pool);
+    public abstract WebSocketChannel createChannel(WebSocketHttpExchange exchange, StreamConnection channel, ByteBufferPool pool);
 
     /**
      * convenience method to perform the upgrade
diff --git a/core/src/main/java/io/undertow/websockets/extensions/ExtensionHandshake.java b/core/src/main/java/io/undertow/websockets/extensions/ExtensionHandshake.java
index 7d3e52e02b..07661dc8ec 100644
--- a/core/src/main/java/io/undertow/websockets/extensions/ExtensionHandshake.java
+++ b/core/src/main/java/io/undertow/websockets/extensions/ExtensionHandshake.java
@@ -45,7 +45,7 @@ public interface ExtensionHandshake {
      * @return          a new {@link WebSocketExtension} instance with parameters accepted;
      *                  {@code null} in case extension request is not accepted
      */
-    WebSocketExtension accept(final WebSocketExtension extension);
+    WebSocketExtension accept(WebSocketExtension extension);
 
     /**
      * Validate if current extension is compatible with previously negotiated in the server side.
@@ -54,7 +54,7 @@ public interface ExtensionHandshake {
      * @return           {@code true} if current extension is compatible;
      *                   {@code false} if current extension is not compatible
      */
-    boolean isIncompatible(final List<ExtensionHandshake> extensions);
+    boolean isIncompatible(List<ExtensionHandshake> extensions);
 
     /**
      * Create a new instance of the {@link ExtensionFunction} associated to this WebSocket Extension.
diff --git a/core/src/main/java/io/undertow/websockets/spi/WebSocketHttpExchange.java b/core/src/main/java/io/undertow/websockets/spi/WebSocketHttpExchange.java
index c58bafebb3..ed5ffdef1f 100644
--- a/core/src/main/java/io/undertow/websockets/spi/WebSocketHttpExchange.java
+++ b/core/src/main/java/io/undertow/websockets/spi/WebSocketHttpExchange.java
@@ -51,9 +51,9 @@
  */
 public interface WebSocketHttpExchange extends Closeable {
 
-    <T> void putAttachment(final AttachmentKey<T> key, T value);
+    <T> void putAttachment(AttachmentKey<T> key, T value);
 
-    <T> T getAttachment(final AttachmentKey<T> key);
+    <T> T getAttachment(AttachmentKey<T> key);
 
     /**
      * gets the first request header with the specified name
@@ -61,7 +61,7 @@ public interface WebSocketHttpExchange extends Closeable {
      * @param headerName The header name
      * @return The header value, or null
      */
-    String getRequestHeader(final String headerName);
+    String getRequestHeader(String headerName);
 
     /**
      * @return An unmodifiable map of request headers
@@ -74,7 +74,7 @@ public interface WebSocketHttpExchange extends Closeable {
      * @param headerName The header name
      * @return The header value, or null
      */
-    String getResponseHeader(final String headerName);
+    String getResponseHeader(String headerName);
 
     /**
      * @return An unmodifiable map of response headers
@@ -85,7 +85,7 @@ public interface WebSocketHttpExchange extends Closeable {
     /**
      * Sets the response headers
      */
-    void setResponseHeaders(final Map<String, List<String>> headers);
+    void setResponseHeaders(Map<String, List<String>> headers);
 
     /**
      * Set a response header
@@ -93,21 +93,21 @@ public interface WebSocketHttpExchange extends Closeable {
      * @param headerName  The header name
      * @param headerValue The header value
      */
-    void setResponseHeader(final String headerName, final String headerValue);
+    void setResponseHeader(String headerName, String headerValue);
 
     /**
      * Upgrade the underlying channel
      *
      * @param upgradeCallback
      */
-    void upgradeChannel(final HttpUpgradeListener upgradeCallback);
+    void upgradeChannel(HttpUpgradeListener upgradeCallback);
 
     /**
      * Send some data
      *
      * @param data The data
      */
-    IoFuture<Void> sendData(final ByteBuffer data);
+    IoFuture<Void> sendData(ByteBuffer data);
 
     /**
      * Gets the body of the request.
diff --git a/core/src/test/java/io/undertow/server/handlers/proxy/mod_cluster/NodeTestHandlers.java b/core/src/test/java/io/undertow/server/handlers/proxy/mod_cluster/NodeTestHandlers.java
index 5519f1876e..5d8de957a7 100644
--- a/core/src/test/java/io/undertow/server/handlers/proxy/mod_cluster/NodeTestHandlers.java
+++ b/core/src/test/java/io/undertow/server/handlers/proxy/mod_cluster/NodeTestHandlers.java
@@ -25,6 +25,6 @@
  */
 interface NodeTestHandlers {
 
-    void setup(final PathHandler handler, final NodeTestConfig config);
+    void setup(PathHandler handler, NodeTestConfig config);
 
 }
diff --git a/pom.xml b/pom.xml
index 064b1b1ef8..cc0adceb55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>35</version>
+        <version>46</version>
     </parent>
 
     <groupId>io.undertow</groupId>
@@ -95,14 +95,13 @@
 
         <!-- Checkstyle configuration -->
         <linkXRef>false</linkXRef>
-        <version.io.undertow.build.checkstyle-config>1.0.1.Final</version.io.undertow.build.checkstyle-config>
+        <version.io.undertow.build.checkstyle-config>2.0.0.Final</version.io.undertow.build.checkstyle-config>
         <version.com.github.spotbugs-maven-plugin>4.7.3.4</version.com.github.spotbugs-maven-plugin>
 
         <version.com.twitter.hpack>1.0.2</version.com.twitter.hpack>
 
         <!-- Non-default maven plugin versions and configuration -->
         <version.org.wildfly.openssl>2.2.1.Final</version.org.wildfly.openssl>
-        <version.checkstyle>7.1</version.checkstyle>
         <version.bundle.plugin>5.1.1</version.bundle.plugin>
 
         <version.jmh>1.21</version.jmh>
diff --git a/servlet/src/main/java/io/undertow/servlet/ServletExtension.java b/servlet/src/main/java/io/undertow/servlet/ServletExtension.java
index 249f10bc09..1233dc4d46 100644
--- a/servlet/src/main/java/io/undertow/servlet/ServletExtension.java
+++ b/servlet/src/main/java/io/undertow/servlet/ServletExtension.java
@@ -40,6 +40,6 @@
  */
 public interface ServletExtension {
 
-    void handleDeployment(final DeploymentInfo deploymentInfo, final ServletContext servletContext);
+    void handleDeployment(DeploymentInfo deploymentInfo, ServletContext servletContext);
 
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java b/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
index e2a904607a..e78edc5426 100644
--- a/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
+++ b/servlet/src/main/java/io/undertow/servlet/UndertowServletLogger.java
@@ -55,7 +55,7 @@ public interface UndertowServletLogger extends BasicLogger {
 
     @LogMessage(level = ERROR)
     @Message(id = 15002, value = "Stopping servlet %s due to permanent unavailability")
-    void stoppingServletDueToPermanentUnavailability(final String servlet, @Cause UnavailableException e);
+    void stoppingServletDueToPermanentUnavailability(String servlet, @Cause UnavailableException e);
 
     @LogMessage(level = ERROR)
     @Message(id = 15003, value = "Stopping servlet %s till %s due to temporary unavailability")
@@ -67,7 +67,7 @@ public interface UndertowServletLogger extends BasicLogger {
 
     @LogMessage(level = ERROR)
     @Message(id = 15005, value = "Error invoking method %s on listener %s")
-    void errorInvokingListener(final String method, Class<?> listenerClass, @Cause Throwable t);
+    void errorInvokingListener(String method, Class<?> listenerClass, @Cause Throwable t);
 
     @LogMessage(level = ERROR)
     @Message(id = 15006, value = "IOException dispatching async event")
diff --git a/servlet/src/main/java/io/undertow/servlet/api/AuthorizationManager.java b/servlet/src/main/java/io/undertow/servlet/api/AuthorizationManager.java
index 068266f211..e29a9b5022 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/AuthorizationManager.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/AuthorizationManager.java
@@ -39,7 +39,7 @@ public interface AuthorizationManager {
      * @param deployment The deployment
      * @return true if the user is in the role
      */
-    boolean isUserInRole(String roleName, final Account account, final ServletInfo servletInfo, final HttpServletRequest request, Deployment deployment);
+    boolean isUserInRole(String roleName, Account account, ServletInfo servletInfo, HttpServletRequest request, Deployment deployment);
 
     /**
      * Tests if a user can access a given resource
@@ -51,7 +51,7 @@ public interface AuthorizationManager {
      * @param deployment The deployment
      * @return true if the user can access the resource
      */
-    boolean canAccessResource(List<SingleConstraintMatch> mappedConstraints, final Account account, final ServletInfo servletInfo, final HttpServletRequest request, Deployment deployment);
+    boolean canAccessResource(List<SingleConstraintMatch> mappedConstraints, Account account, ServletInfo servletInfo, HttpServletRequest request, Deployment deployment);
 
     /**
      * Determines the transport guarantee type
@@ -61,6 +61,6 @@ public interface AuthorizationManager {
      * @param request The request
      * @return The transport guarantee type
      */
-    TransportGuaranteeType transportGuarantee(TransportGuaranteeType currentConnectionGuarantee, TransportGuaranteeType configuredRequiredGuarantee, final HttpServletRequest request);
+    TransportGuaranteeType transportGuarantee(TransportGuaranteeType currentConnectionGuarantee, TransportGuaranteeType configuredRequiredGuarantee, HttpServletRequest request);
 
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/ClassIntrospecter.java b/servlet/src/main/java/io/undertow/servlet/api/ClassIntrospecter.java
index 13c1fe055d..ef6aaa60ba 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/ClassIntrospecter.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/ClassIntrospecter.java
@@ -30,6 +30,6 @@
  */
 public interface ClassIntrospecter {
 
-    <T> InstanceFactory<T> createInstanceFactory(final Class<T> clazz) throws NoSuchMethodException;
+    <T> InstanceFactory<T> createInstanceFactory(Class<T> clazz) throws NoSuchMethodException;
 
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/ConfidentialPortManager.java b/servlet/src/main/java/io/undertow/servlet/api/ConfidentialPortManager.java
index ed488b92e2..f2a783172a 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/ConfidentialPortManager.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/ConfidentialPortManager.java
@@ -33,6 +33,6 @@ public interface ConfidentialPortManager {
      * @param exchange The current {@link HttpServerExchange} being redirected.
      * @return The port to use in the redirection URI or {@code -1} if no configured port is available.
      */
-    int getConfidentialPort(final HttpServerExchange exchange);
+    int getConfidentialPort(HttpServerExchange exchange);
 
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/ExceptionHandler.java b/servlet/src/main/java/io/undertow/servlet/api/ExceptionHandler.java
index ebc9cc83aa..4fec236a59 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/ExceptionHandler.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/ExceptionHandler.java
@@ -49,5 +49,5 @@ public interface ExceptionHandler {
      * @param throwable       The exception
      * @return <code>true</code> true if the error was handled by this method
      */
-    boolean handleThrowable(final HttpServerExchange exchange, ServletRequest request, ServletResponse response, Throwable throwable);
+    boolean handleThrowable(HttpServerExchange exchange, ServletRequest request, ServletResponse response, Throwable throwable);
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/LifecycleInterceptor.java b/servlet/src/main/java/io/undertow/servlet/api/LifecycleInterceptor.java
index 34aaefcbc9..63aaf17171 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/LifecycleInterceptor.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/LifecycleInterceptor.java
@@ -22,7 +22,7 @@ public interface LifecycleInterceptor {
 
     void destroy(FilterInfo filterInfo, Filter filter, LifecycleContext context) throws ServletException;
 
-    public interface LifecycleContext {
+    interface LifecycleContext {
         void proceed() throws ServletException;
     }
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/ServletDispatcher.java b/servlet/src/main/java/io/undertow/servlet/api/ServletDispatcher.java
index 28d16486d5..25df34e99b 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/ServletDispatcher.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/ServletDispatcher.java
@@ -35,12 +35,12 @@ public interface ServletDispatcher {
      * Dispatches a servlet request to the specified servlet path, changing the current path
      * @see io.undertow.servlet.handlers.ServletRequestContext
      */
-    void dispatchToPath(final HttpServerExchange exchange, final ServletPathMatch pathMatch, final DispatcherType dispatcherType) throws Exception;
+    void dispatchToPath(HttpServerExchange exchange, ServletPathMatch pathMatch, DispatcherType dispatcherType) throws Exception;
 
     /**
      * Dispatches a servlet request to the specified servlet, without changing the current path
      */
-    void dispatchToServlet(final HttpServerExchange exchange, final ServletChain servletChain, final DispatcherType dispatcherType) throws Exception;
+    void dispatchToServlet(HttpServerExchange exchange, ServletChain servletChain, DispatcherType dispatcherType) throws Exception;
 
     /**
      * Dispatches a mock request to the servlet container.
@@ -48,5 +48,5 @@ public interface ServletDispatcher {
      * @param request The request
      * @param response The response
      */
-    void dispatchMockRequest(final HttpServletRequest request, final HttpServletResponse response) throws ServletException;
+    void dispatchMockRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException;
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/SessionConfigWrapper.java b/servlet/src/main/java/io/undertow/servlet/api/SessionConfigWrapper.java
index a934918295..2216e45215 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/SessionConfigWrapper.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/SessionConfigWrapper.java
@@ -29,5 +29,5 @@
  */
 public interface SessionConfigWrapper {
 
-    SessionConfig wrap(final SessionConfig sessionConfig, final Deployment deployment);
+    SessionConfig wrap(SessionConfig sessionConfig, Deployment deployment);
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/SessionManagerFactory.java b/servlet/src/main/java/io/undertow/servlet/api/SessionManagerFactory.java
index d5ce63cf5f..89f988e9a5 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/SessionManagerFactory.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/SessionManagerFactory.java
@@ -27,6 +27,6 @@
  */
 public interface SessionManagerFactory {
 
-    SessionManager createSessionManager(final Deployment deployment);
+    SessionManager createSessionManager(Deployment deployment);
 
 }
diff --git a/servlet/src/main/java/io/undertow/servlet/api/SessionPersistenceManager.java b/servlet/src/main/java/io/undertow/servlet/api/SessionPersistenceManager.java
index 9ddb1332ad..a8a151a43c 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/SessionPersistenceManager.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/SessionPersistenceManager.java
@@ -31,11 +31,11 @@
  */
 public interface SessionPersistenceManager {
 
-    void persistSessions(final String deploymentName, Map<String, PersistentSession> sessionData);
+    void persistSessions(String deploymentName, Map<String, PersistentSession> sessionData);
 
-    Map<String, PersistentSession> loadSessionAttributes(final String deploymentName, final ClassLoader classLoader);
+    Map<String, PersistentSession> loadSessionAttributes(String deploymentName, ClassLoader classLoader);
 
-    void clear(final String deploymentName);
+    void clear(String deploymentName);
 
     class PersistentSession {
         private final Date expiration;
diff --git a/servlet/src/main/java/io/undertow/servlet/api/ThreadSetupAction.java b/servlet/src/main/java/io/undertow/servlet/api/ThreadSetupAction.java
index 5f7eca8372..25fba53db1 100644
--- a/servlet/src/main/java/io/undertow/servlet/api/ThreadSetupAction.java
+++ b/servlet/src/main/java/io/undertow/servlet/api/ThreadSetupAction.java
@@ -35,9 +35,9 @@ public interface ThreadSetupAction {
      * @param exchange The exchange, this may be null
      * @return A handle to tear down the request when the invocation is finished, or null
      */
-    Handle setup(final HttpServerExchange exchange);
+    Handle setup(HttpServerExchange exchange);
 
-    public interface Handle {
+    interface Handle {
         void tearDown();
     }
 
diff --git a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/WebsocketClientSslProvider.java b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/WebsocketClientSslProvider.java
index f9b4360f78..5fe6513828 100644
--- a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/WebsocketClientSslProvider.java
+++ b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/WebsocketClientSslProvider.java
@@ -33,10 +33,10 @@
  */
 public interface WebsocketClientSslProvider {
 
-    XnioSsl getSsl(XnioWorker worker, final Class<?> annotatedEndpoint, URI uri);
+    XnioSsl getSsl(XnioWorker worker, Class<?> annotatedEndpoint, URI uri);
 
-    XnioSsl getSsl(XnioWorker worker, final Object annotatedEndpointInstance, URI uri);
+    XnioSsl getSsl(XnioWorker worker, Object annotatedEndpointInstance, URI uri);
 
-    XnioSsl getSsl(XnioWorker worker, final Endpoint endpoint, final ClientEndpointConfig cec, URI uri);
+    XnioSsl getSsl(XnioWorker worker, Endpoint endpoint, ClientEndpointConfig cec, URI uri);
 
 }
diff --git a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/BoundParameter.java b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/BoundParameter.java
index b4fabade3a..ca6a43ea0b 100644
--- a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/BoundParameter.java
+++ b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/annotated/BoundParameter.java
@@ -29,7 +29,7 @@
 public interface BoundParameter {
     Set<Integer> positions();
 
-    void populate(final Object[] params, final Map<Class<?>, Object> value) throws DecodeException;
+    void populate(Object[] params, Map<Class<?>, Object> value) throws DecodeException;
 
     Class<?> getType();
 }
diff --git a/websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/annotated/GenericWebSocketClientEndpoint.java b/websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/annotated/GenericWebSocketClientEndpoint.java
index 6d29cf42d2..f1ea8ced0e 100644
--- a/websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/annotated/GenericWebSocketClientEndpoint.java
+++ b/websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/annotated/GenericWebSocketClientEndpoint.java
@@ -2,5 +2,5 @@
 
 public interface GenericWebSocketClientEndpoint<M> {
 
-    void onMessage(final M message);
+    void onMessage(M message);
 }