diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 8c9153aa2..756ef5ea7 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -74,6 +74,7 @@
 		<module name="AvoidStarImport"/>
 		<module name="IllegalImport"/>
 		<module name="RedundantImport"/>
+		<module name="RedundantModifier"/>
 		<module name="UpperEll"/>
 		<module name="ArrayTypeStyle"/>
 		<module name="GenericWhitespace"/>
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
index d7ae0d8af..9f2cee262 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
@@ -338,7 +338,7 @@ public interface XMPPConnection {
      * @param packetListener the stanza(/packet) listener to notify of sent packets.
      * @param packetFilter   the stanza(/packet) filter to use.
      */
-    public void addStanzaSendingListener(StanzaListener packetListener, StanzaFilter packetFilter);
+    void addStanzaSendingListener(StanzaListener packetListener, StanzaFilter packetFilter);
 
     /**
      * Removes a stanza(/packet) listener for sending packets from this connection.
@@ -355,7 +355,7 @@ public interface XMPPConnection {
      *
      * @param packetListener the stanza(/packet) listener to remove.
      */
-    public void removeStanzaSendingListener(StanzaListener packetListener);
+    void removeStanzaSendingListener(StanzaListener packetListener);
 
     /**
      * Registers a stanza(/packet) interceptor with this connection. The interceptor will be
@@ -582,7 +582,7 @@ public interface XMPPConnection {
     @Deprecated
     // TODO: Remove in Smack 4.4.
     void sendStanzaWithResponseCallback(Stanza stanza, StanzaFilter replyFilter,
-                    final StanzaListener callback, @SuppressWarnings("deprecation") final ExceptionCallback exceptionCallback,
+                    StanzaListener callback, @SuppressWarnings("deprecation") ExceptionCallback exceptionCallback,
                     long timeout) throws NotConnectedException, InterruptedException;
 
     /**
@@ -638,8 +638,8 @@ public interface XMPPConnection {
      */
     @Deprecated
     // TODO: Remove in Smack 4.4.
-    void sendIqWithResponseCallback(IQ iqRequest, final StanzaListener callback,
-                    @SuppressWarnings("deprecation") final ExceptionCallback exceptionCallback, long timeout)
+    void sendIqWithResponseCallback(IQ iqRequest, StanzaListener callback,
+                    @SuppressWarnings("deprecation") ExceptionCallback exceptionCallback, long timeout)
                     throws NotConnectedException, InterruptedException;
 
     /**
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
index 1a70ee5e3..ce3df962f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
@@ -317,7 +317,7 @@ public class XMPPError extends AbstractError {
      *      <li>XMPPError.Type.CONTINUE - proceed (the condition was only a warning)
      * </ul>
      */
-    public static enum Type {
+    public enum Type {
         WAIT,
         CANCEL,
         MODIFY,
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java
index 1a6b84e7d..914b177cb 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java
@@ -203,7 +203,7 @@ public abstract class SASLMechanism implements Comparable<SASLMechanism> {
 
     protected abstract void authenticateInternal(CallbackHandler cbh) throws SmackException;
 
-    private final void authenticate() throws SmackException, NotConnectedException, InterruptedException {
+    private void authenticate() throws SmackException, NotConnectedException, InterruptedException {
         byte[] authenticationBytes = getAuthenticationText();
         String authenticationText;
         // Some SASL mechanisms do return an empty array (e.g. EXTERNAL from javax), so check that
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
index 8ee5ba1ba..e7a96bdf5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/ScramMechanism.java
@@ -226,7 +226,7 @@ public abstract class ScramMechanism extends SASLMechanism {
         return null;
     }
 
-    private final String getGS2Header() {
+    private String getGS2Header() {
         String authzidPortion = "";
         if (authorizationId != null) {
             authzidPortion = "a=" + authorizationId;
@@ -238,7 +238,7 @@ public abstract class ScramMechanism extends SASLMechanism {
         return cbName + ',' + authzidPortion + ",";
     }
 
-    private final byte[] getCBindInput() throws SmackException {
+    private byte[] getCBindInput() throws SmackException {
         byte[] cbindData = getChannelBindingData();
         byte[] gs2Header = toBytes(getGS2Header());
 
@@ -409,7 +409,7 @@ public abstract class ScramMechanism extends SASLMechanism {
         private final byte[] clientKey;
         private final byte[] serverKey;
 
-        public Keys(byte[] clientKey, byte[] serverKey) {
+        Keys(byte[] clientKey, byte[] serverKey) {
             this.clientKey = clientKey;
             this.serverKey = serverKey;
         }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
index 742b34cf1..a38063c4d 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ArrayBlockingQueueWithShutdown.java
@@ -53,18 +53,18 @@ public class ArrayBlockingQueueWithShutdown<E> extends AbstractQueue<E> implemen
 
     private volatile boolean isShutdown = false;
 
-    private final int inc(int i) {
+    private int inc(int i) {
         return (++i == items.length) ? 0 : i;
     }
 
-    private final void insert(E e) {
+    private void insert(E e) {
         items[putIndex] = e;
         putIndex = inc(putIndex);
         count++;
         notEmpty.signal();
     }
 
-    private final E extract() {
+    private E extract() {
         E e = items[takeIndex];
         items[takeIndex] = null;
         takeIndex = inc(takeIndex);
@@ -73,7 +73,7 @@ public class ArrayBlockingQueueWithShutdown<E> extends AbstractQueue<E> implemen
         return e;
     }
 
-    private final void removeAt(int i) {
+    private void removeAt(int i) {
         if (i == takeIndex) {
             items[takeIndex] = null;
             takeIndex = inc(takeIndex);
@@ -96,31 +96,31 @@ public class ArrayBlockingQueueWithShutdown<E> extends AbstractQueue<E> implemen
         notFull.signal();
     }
 
-    private final static void checkNotNull(Object o) {
+    private static void checkNotNull(Object o) {
         if (o == null) {
             throw new NullPointerException();
         }
     }
 
-    private final void checkNotShutdown() throws InterruptedException {
+    private void checkNotShutdown() throws InterruptedException {
         if (isShutdown) {
             throw new InterruptedException();
         }
     }
 
-    private final boolean hasNoElements() {
+    private boolean hasNoElements() {
         return count == 0;
     }
 
-    private final boolean hasElements() {
+    private boolean hasElements() {
         return !hasNoElements();
     }
 
-    private final boolean isFull() {
+    private boolean isFull() {
         return count == items.length;
     }
 
-    private final boolean isNotFull() {
+    private boolean isNotFull() {
         return !isFull();
     }
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
index 67ac615f8..98f53a7f8 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java
@@ -110,7 +110,7 @@ public class DNSUtil {
         DNSUtil.idnaTransformer = idnaTransformer;
     }
 
-    private static enum DomainType {
+    private enum DomainType {
         Server,
         Client,
         ;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
index c778fcdf3..00348c3c5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/EventManger.java
@@ -92,6 +92,6 @@ public class EventManger<K, R, E extends Exception> {
     }
 
     public interface Callback<E extends Exception> {
-        public void action() throws E;
+        void action() throws E;
     }
 }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
index e3b91783f..5fb73ff5f 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java
@@ -110,7 +110,7 @@ public abstract class DNSResolver {
         return false;
     }
 
-    private final void checkIfDnssecRequestedAndSupported(DnssecMode dnssecMode) {
+    private void checkIfDnssecRequestedAndSupported(DnssecMode dnssecMode) {
         if (dnssecMode != DnssecMode.disabled && !supportsDnssec) {
             throw new UnsupportedOperationException("This resolver does not support DNSSEC");
         }
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
index 1ee1180a9..49265ed28 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java
@@ -197,7 +197,7 @@ public class StanzaCollectorTest
 
     static class TestPacket extends Stanza
     {
-        public TestPacket(int i)
+        TestPacket(int i)
         {
             setStanzaId(String.valueOf(i));
         }
diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java
index a6e0a41cb..0c8db5ce4 100644
--- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java
+++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JLoggingConnectionListener.java
@@ -29,7 +29,7 @@ class SLF4JLoggingConnectionListener extends AbstractConnectionListener implemen
     private final XMPPConnection connection;
     private final Logger logger;
 
-    public SLF4JLoggingConnectionListener(XMPPConnection connection, Logger logger) {
+    SLF4JLoggingConnectionListener(XMPPConnection connection, Logger logger) {
         this.connection = Validate.notNull(connection);
         this.logger = Validate.notNull(logger);
     }
diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java
index ee0840d8a..70da58082 100644
--- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java
+++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JRawXmlListener.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
 class SLF4JRawXmlListener implements ReaderListener, WriterListener {
     private final Logger logger;
 
-    public SLF4JRawXmlListener(Logger logger) {
+    SLF4JRawXmlListener(Logger logger) {
         this.logger = Validate.notNull(logger);
     }
 
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 72b6ffbf2..dd1ba277b 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -934,7 +934,7 @@ public class EnhancedDebugger extends SmackDebugger {
      * The whole text to send must be passed to the constructor. This implies that the client of
      * this class is responsible for sending a valid text to the constructor.
      */
-    private static class AdHocPacket extends Stanza {
+    private static final class AdHocPacket extends Stanza {
 
         private final String text;
 
@@ -944,7 +944,7 @@ public class EnhancedDebugger extends SmackDebugger {
          *
          * @param text the whole text of the stanza(/packet) to send
          */
-        public AdHocPacket(String text) {
+        private AdHocPacket(String text) {
             this.text = text;
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index b91e10731..3be4a83dc 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -293,7 +293,7 @@ public class MultipleRecipientManager {
      * (i.e. cannot change the TO address of a queues stanza(/packet) to be sent) then this class was
      * created to keep the XML stanza to send.
      */
-    private static class PacketCopy extends Stanza {
+    private static final class PacketCopy extends Stanza {
 
         private final CharSequence text;
 
@@ -303,7 +303,7 @@ public class MultipleRecipientManager {
          *
          * @param text the whole text of the stanza(/packet) to send
          */
-        public PacketCopy(CharSequence text) {
+        private PacketCopy(CharSequence text) {
             this.text = text;
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
index 0c1bfa6d2..b4fe52332 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
@@ -48,7 +48,7 @@ class DataListener extends AbstractIqRequestHandler {
      * 
      * @param manager the In-Band Bytestream manager
      */
-    public DataListener(InBandBytestreamManager manager) {
+    DataListener(InBandBytestreamManager manager) {
       super(DataPacketExtension.ELEMENT, DataPacketExtension.NAMESPACE, IQ.Type.set, Mode.async);
         this.manager = manager;
     }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 4ef08d410..3c298a979 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -274,7 +274,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         /**
          * Constructor.
          */
-        public IBBInputStream() {
+        protected IBBInputStream() {
             // add data packet listener to connection
             this.dataPacketListener = getDataPacketListener();
             connection.addSyncStanzaListener(this.dataPacketListener, getDataPacketFilter());
@@ -627,7 +627,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         /**
          * Constructor.
          */
-        public IBBOutputStream() {
+        private IBBOutputStream() {
             this.buffer = new byte[byteStreamRequest.getBlockSize()];
         }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index a5f07535a..533a4f868 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -664,14 +664,14 @@ public final class AdHocCommandManager extends Manager {
     /**
      * Stores ad-hoc command information.
      */
-    private static class AdHocCommandInfo {
+    private static final class AdHocCommandInfo {
 
         private String node;
         private String name;
         private final Jid ownerJID;
         private LocalCommandFactory factory;
 
-        public AdHocCommandInfo(String node, String name, Jid ownerJID,
+        private AdHocCommandInfo(String node, String name, Jid ownerJID,
                 LocalCommandFactory factory)
         {
             this.node = node;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
index 49893c123..92633be0e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java
@@ -29,5 +29,5 @@ public interface FileTransferListener {
      * @param request
      *            The request from the other user.
      */
-    void fileTransferRequest(final FileTransferRequest request);
+    void fileTransferRequest(FileTransferRequest request);
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
index 223bfa5e6..578f2ae22 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportSession.java
@@ -345,12 +345,12 @@ public class JingleS5BTransportSession extends JingleTransportSession<JingleS5BT
         return JingleS5BTransportManager.getInstanceFor(jingleSession.getConnection());
     }
 
-    private static class UsedCandidate {
+    private static final class UsedCandidate {
         private final Socket socket;
         private final JingleS5BTransport transport;
         private final JingleS5BTransportCandidate candidate;
 
-        public UsedCandidate(JingleS5BTransport transport, JingleS5BTransportCandidate candidate, Socket socket) {
+        private UsedCandidate(JingleS5BTransport transport, JingleS5BTransportCandidate candidate, Socket socket) {
             this.socket = socket;
             this.transport = transport;
             this.candidate = candidate;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
index fb380d7d3..2855d8e5a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java
@@ -45,7 +45,7 @@ public interface InvitationListener {
      * @param message the message used by the inviter to send the invitation.
      * @param invitation the raw invitation received with the message.
      */
-    public abstract void invitationReceived(XMPPConnection conn, MultiUserChat room, EntityJid inviter, String reason,
+    void invitationReceived(XMPPConnection conn, MultiUserChat room, EntityJid inviter, String reason,
                                             String password, Message message, MUCUser.Invite invitation);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
index 2c6e95619..b31d0830d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java
@@ -38,6 +38,6 @@ public interface InvitationRejectionListener {
      * @param message the message used to decline the invitation.
      * @param rejection the raw decline found in the message.
      */
-    public abstract void invitationDeclined(EntityBareJid invitee, String reason, Message message, MUCUser.Decline rejection);
+    void invitationDeclined(EntityBareJid invitee, String reason, Message message, MUCUser.Decline rejection);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
index 0fd810793..d22fbd0af 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java
@@ -37,7 +37,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that has just joined the room
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void joined(EntityFullJid participant);
+    void joined(EntityFullJid participant);
 
     /**
      * Called when a room occupant has left the room on its own. This means that the occupant was
@@ -46,7 +46,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that has left the room on its own.
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void left(EntityFullJid participant);
+    void left(EntityFullJid participant);
 
     /**
      * Called when a room participant has been kicked from the room. This means that the kicked 
@@ -57,7 +57,7 @@ public interface ParticipantStatusListener {
      * @param actor the moderator that kicked the occupant from the room (e.g. user@host.org).
      * @param reason the reason provided by the actor to kick the occupant from the room.
      */
-    public abstract void kicked(EntityFullJid participant, Jid actor, String reason);
+    void kicked(EntityFullJid participant, Jid actor, String reason);
 
     /**
      * Called when a moderator grants voice to a visitor. This means that the visitor 
@@ -66,7 +66,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was granted voice in the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void voiceGranted(EntityFullJid participant);
+    void voiceGranted(EntityFullJid participant);
 
     /**
      * Called when a moderator revokes voice from a participant. This means that the participant 
@@ -76,7 +76,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was revoked voice from the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void voiceRevoked(EntityFullJid participant);
+    void voiceRevoked(EntityFullJid participant);
 
     /**
      * Called when an administrator or owner banned a participant from the room. This means that 
@@ -87,7 +87,7 @@ public interface ParticipantStatusListener {
      * @param actor the administrator that banned the occupant (e.g. user@host.org).
      * @param reason the reason provided by the administrator to ban the occupant.
      */
-    public abstract void banned(EntityFullJid participant, Jid actor, String reason);
+    void banned(EntityFullJid participant, Jid actor, String reason);
 
     /**
      * Called when an administrator grants a user membership to the room. This means that the user 
@@ -96,7 +96,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was granted membership in the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void membershipGranted(EntityFullJid participant);
+     void membershipGranted(EntityFullJid participant);
 
     /**
      * Called when an administrator revokes a user membership to the room. This means that the 
@@ -105,7 +105,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was revoked membership from the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void membershipRevoked(EntityFullJid participant);
+     void membershipRevoked(EntityFullJid participant);
 
     /**
      * Called when an administrator grants moderator privileges to a user. This means that the user 
@@ -115,7 +115,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was granted moderator privileges in the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void moderatorGranted(EntityFullJid participant);
+     void moderatorGranted(EntityFullJid participant);
 
     /**
      * Called when an administrator revokes moderator privileges from a user. This means that the 
@@ -125,7 +125,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was revoked moderator privileges in the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void moderatorRevoked(EntityFullJid participant);
+     void moderatorRevoked(EntityFullJid participant);
 
     /**
      * Called when an owner grants a user ownership on the room. This means that the user 
@@ -135,7 +135,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was granted ownership on the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void ownershipGranted(EntityFullJid participant);
+     void ownershipGranted(EntityFullJid participant);
 
     /**
      * Called when an owner revokes a user ownership on the room. This means that the user 
@@ -145,7 +145,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was revoked ownership on the room 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void ownershipRevoked(EntityFullJid participant);
+     void ownershipRevoked(EntityFullJid participant);
 
     /**
      * Called when an owner grants administrator privileges to a user. This means that the user 
@@ -155,7 +155,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was granted administrator privileges 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void adminGranted(EntityFullJid participant);
+     void adminGranted(EntityFullJid participant);
 
     /**
      * Called when an owner revokes administrator privileges from a user. This means that the user 
@@ -165,7 +165,7 @@ public interface ParticipantStatusListener {
      * @param participant the participant that was revoked administrator privileges 
      * (e.g. room@conference.jabber.org/nick).
      */
-    public abstract void adminRevoked(EntityFullJid participant);
+     void adminRevoked(EntityFullJid participant);
 
     /**
      * Called when a participant changed his/her nickname in the room. The new participant's 
@@ -175,6 +175,6 @@ public interface ParticipantStatusListener {
      * (e.g. room@conference.jabber.org/nick).
      * @param newNickname the new nickname that the participant decided to use.
      */
-    public abstract void nicknameChanged(EntityFullJid participant, Resourcepart newNickname);
+     void nicknameChanged(EntityFullJid participant, Resourcepart newNickname);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
index 91bae3f1a..723d4a787 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java
@@ -32,6 +32,6 @@ public interface SubjectUpdatedListener {
      * @param subject the new room's subject.
      * @param from the user that changed the room's subject or <code>null</code> if the room itself changed the subject.
      */
-    public abstract void subjectUpdated(String subject, EntityFullJid from);
+    void subjectUpdated(String subject, EntityFullJid from);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
index b9f874425..e0b270660 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java
@@ -34,7 +34,7 @@ public interface UserStatusListener {
      * @param actor the moderator that kicked your user from the room (e.g. user@host.org).
      * @param reason the reason provided by the actor to kick you from the room.
      */
-    public abstract void kicked(Jid actor, String reason);
+     void kicked(Jid actor, String reason);
 
     /**
      * Called when a moderator grants voice to your user. This means that you were a visitor in 
@@ -42,7 +42,7 @@ public interface UserStatusListener {
      * all occupants.
      * 
      */
-    public abstract void voiceGranted();
+     void voiceGranted();
 
     /**
      * Called when a moderator revokes voice from your user. This means that you were a 
@@ -50,7 +50,7 @@ public interface UserStatusListener {
      * messages to the room occupants.
      * 
      */
-    public abstract void voiceRevoked();
+     void voiceRevoked();
 
     /**
      * Called when an administrator or owner banned your user from the room. This means that you 
@@ -59,21 +59,21 @@ public interface UserStatusListener {
      * @param actor the administrator that banned your user (e.g. user@host.org).
      * @param reason the reason provided by the administrator to banned you.
      */
-    public abstract void banned(Jid actor, String reason);
+     void banned(Jid actor, String reason);
 
     /**
      * Called when an administrator grants your user membership to the room. This means that you 
      * will be able to join the members-only room. 
      * 
      */
-    public abstract void membershipGranted();
+     void membershipGranted();
 
     /**
      * Called when an administrator revokes your user membership to the room. This means that you 
      * will not be able to join the members-only room.
      * 
      */
-    public abstract void membershipRevoked();
+     void membershipRevoked();
 
     /**
      * Called when an administrator grants moderator privileges to your user. This means that you 
@@ -81,7 +81,7 @@ public interface UserStatusListener {
      * subject plus all the partcipants privileges.
      * 
      */
-    public abstract void moderatorGranted();
+     void moderatorGranted();
 
     /**
      * Called when an administrator revokes moderator privileges from your user. This means that 
@@ -89,7 +89,7 @@ public interface UserStatusListener {
      * modify room's subject plus all the partcipants privileges.
      * 
      */
-    public abstract void moderatorRevoked();
+     void moderatorRevoked();
 
     /**
      * Called when an owner grants to your user ownership on the room. This means that you 
@@ -97,7 +97,7 @@ public interface UserStatusListener {
      * functions.
      * 
      */
-    public abstract void ownershipGranted();
+     void ownershipGranted();
 
     /**
      * Called when an owner revokes from your user ownership on the room. This means that you 
@@ -105,7 +105,7 @@ public interface UserStatusListener {
      * administrative functions.
      * 
      */
-    public abstract void ownershipRevoked();
+     void ownershipRevoked();
 
     /**
      * Called when an owner grants administrator privileges to your user. This means that you 
@@ -113,7 +113,7 @@ public interface UserStatusListener {
      * list.
      * 
      */
-    public abstract void adminGranted();
+     void adminGranted();
 
     /**
      * Called when an owner revokes administrator privileges from your user. This means that you 
@@ -121,7 +121,7 @@ public interface UserStatusListener {
      * moderator list.
      * 
      */
-    public abstract void adminRevoked();
+     void adminRevoked();
 
     /**
      * Called when the room is destroyed.
@@ -129,6 +129,6 @@ public interface UserStatusListener {
      * @param alternateMUC an alternate MultiUserChat, may be null.
      * @param reason the reason why the room was closed, may be null.
      */
-    public abstract void roomDestroyed(MultiUserChat alternateMUC, String reason);
+     void roomDestroyed(MultiUserChat alternateMUC, String reason);
 
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
index ad63e14aa..56a121ea8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
@@ -43,7 +43,7 @@ class SimpleUserSearch extends IQ {
     private Form form;
     private ReportedData data;
 
-    public SimpleUserSearch() {
+    SimpleUserSearch() {
         super(ELEMENT, NAMESPACE);
     }
 
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java b/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
index 5bba962f0..da562aae6 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/chat/ChatConnectionTest.java
@@ -352,11 +352,11 @@ public class ChatConnectionTest {
         private Chat newChat;
         private ChatMessageListener listener;
 
-        public TestChatManagerListener(TestMessageListener msgListener) {
+        TestChatManagerListener(TestMessageListener msgListener) {
             listener = msgListener;
         }
 
-        public TestChatManagerListener() {
+        TestChatManagerListener() {
         }
 
         @Override
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
index c565a295b..a52d9566e 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/RosterTest.java
@@ -657,7 +657,7 @@ public class RosterTest extends InitSmackIm {
          * 
          * @param updateRequest the request which would be sent to the server.
          */
-        abstract void verifyUpdateRequest(final RosterPacket updateRequest);
+        abstract void verifyUpdateRequest(RosterPacket updateRequest);
 
         @Override
         public void run() {
diff --git a/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java b/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
index 64778421b..129e4fe2e 100644
--- a/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
+++ b/smack-im/src/test/java/org/jivesoftware/smack/roster/SubscriptionPreApprovalTest.java
@@ -148,13 +148,13 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
          * 
          * @param updateRequest the request which would be sent to the server.
          */
-        abstract void verifyRosterUpdateRequest(final RosterPacket updateRequest);
+        abstract void verifyRosterUpdateRequest(RosterPacket updateRequest);
         /**
          * Overwrite this method to check if received pre-approval request is valid
          *
          * @param preApproval the request which would be sent to server.
          */
-        abstract void verifyPreApprovalRequest(final Presence preApproval);
+        abstract void verifyPreApprovalRequest(Presence preApproval);
 
         @Override
         public void run() {
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
index 911ae91d5..58fc992ea 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackLowLevelIntegrationTest.java
@@ -62,6 +62,6 @@ public abstract class AbstractSmackLowLevelIntegrationTest extends AbstractSmack
     }
 
     public interface ConnectionCallback {
-        public void connectionCallback(XMPPTCPConnection connection) throws Exception;
+        void connectionCallback(XMPPTCPConnection connection) throws Exception;
     }
 }
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
index 4b7cb43bf..8873d6c9c 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
@@ -75,8 +75,8 @@ public abstract class JingleMediaManager {
      * @param local
      * @return the media session
      */
-    public abstract JingleMediaSession createMediaSession(PayloadType payloadType, final TransportCandidate remote,
-            final TransportCandidate local, JingleSession jingleSession);
+    public abstract JingleMediaSession createMediaSession(PayloadType payloadType, TransportCandidate remote,
+            TransportCandidate local, JingleSession jingleSession);
 
     // This is to set the attributes of the <content> element of the Jingle packet.    
     public String getName() {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
index 8bafc18cb..6da1a4927 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java
@@ -83,7 +83,7 @@ public class HttpServer {
         OutputStream output;
         BufferedReader br;
 
-        public HttpRequestHandler(Socket socket) throws Exception {
+        HttpRequestHandler(Socket socket) throws Exception {
             this.socket = socket;
             this.input = socket.getInputStream();
             this.output = socket.getOutputStream();
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
index c67f7af79..abd8e1bcb 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java
@@ -82,7 +82,7 @@ public abstract class JingleTransportProvider extends ExtensionElementProvider<J
         return trans;
     }
 
-    protected abstract JingleTransportCandidate parseCandidate(final XmlPullParser parser);
+    protected abstract JingleTransportCandidate parseCandidate(XmlPullParser parser);
 
     /**
      * RTP-ICE profile.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
index 70fda6ad2..d0e6c8829 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
@@ -133,7 +133,7 @@ public class RoomTransfer implements ExtensionElement {
     /**
      * Type of entity being invited to a groupchat support session.
      */
-    public static enum Type {
+    public enum Type {
         /**
          * A user is being invited to a groupchat support session. The user could be another agent
          * or just a regular XMPP user.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 5ab295c5a..c99dc729d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -564,12 +564,12 @@ public class Workgroup {
     /**
      * IQ stanza(/packet) to request joining the workgroup queue.
      */
-    private class JoinQueuePacket extends IQ {
+    private final class JoinQueuePacket extends IQ {
 
         private final Jid userID;
         private final DataForm form;
 
-        public JoinQueuePacket(Jid workgroup, Form answerForm, Jid userID) {
+        private JoinQueuePacket(Jid workgroup, Form answerForm, Jid userID) {
             super("join-queue", "http://jabber.org/protocol/workgroup");
             this.userID = userID;
 
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
index 044c4f570..f1c9ac796 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/OmemoService.java
@@ -1280,7 +1280,7 @@ public abstract class OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey,
         private final OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Sess, T_Addr, T_ECPub, T_Bundle, T_Ciph> service;
         private final StanzaFilter filter;
 
-        public OmemoCarbonCopyListener(OmemoManager omemoManager,
+        OmemoCarbonCopyListener(OmemoManager omemoManager,
                                        OmemoService<T_IdKeyPair, T_IdKey, T_PreKey, T_SigPreKey, T_Sess, T_Addr, T_ECPub, T_Bundle, T_Ciph> service,
                                        StanzaFilter filter) {
             this.omemoManager = omemoManager;
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
index 96980ef26..86ce8bf3b 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
@@ -254,7 +254,7 @@ public class StreamManagement {
         private final long handledCount;
         private final String previd;
 
-        public AbstractResume(long handledCount, String previd) {
+        private AbstractResume(long handledCount, String previd) {
             this.handledCount = handledCount;
             this.previd = previd;
         }