diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
index 9a5c2eac99..6c14562c52 100644
--- a/cli/src/main/java/hudson/cli/CLI.java
+++ b/cli/src/main/java/hudson/cli/CLI.java
@@ -82,11 +82,11 @@ public class CLI {
             throw new NotTalkingToJenkinsException(c);
     }
     /*package*/ static final class NotTalkingToJenkinsException extends IOException {
-        public NotTalkingToJenkinsException(String s) {
+        NotTalkingToJenkinsException(String s) {
             super(s);
         }
 
-        public NotTalkingToJenkinsException(URLConnection c) {
+        NotTalkingToJenkinsException(URLConnection c) {
             super("There's no Jenkins running at " + c.getURL().toString());
         }
     }
@@ -372,7 +372,7 @@ public class CLI {
     private static int plainHttpConnection(String url, List<String> args, CLIConnectionFactory factory) throws IOException, InterruptedException {
         LOGGER.log(FINE, "Trying to connect to {0} via plain protocol over HTTP", url);
         FullDuplexHttpStream streams = new FullDuplexHttpStream(new URL(url), "cli?remoting=false", factory.authorization);
-        try (final ClientSideImpl connection = new ClientSideImpl(new PlainCLIProtocol.FramedOutput(streams.getOutputStream()))) {
+        try (ClientSideImpl connection = new ClientSideImpl(new PlainCLIProtocol.FramedOutput(streams.getOutputStream()))) {
             connection.start(args);
             InputStream is = streams.getInputStream();
             if (is.read() != 0) { // cf. FullDuplexHttpService
diff --git a/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java
index dd24d736e7..505eddccf0 100644
--- a/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java
+++ b/cli/src/main/java/hudson/cli/FlightRecorderInputStream.java
@@ -135,7 +135,7 @@ class FlightRecorderInputStream extends InputStream {
 
         boolean filled = false;
 
-        public ByteArrayRingBuffer(int capacity) {
+        ByteArrayRingBuffer(int capacity) {
             data = new byte[capacity];
             this.capacity = capacity;
         }
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index f50135b7f1..8f24c084f4 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -577,7 +577,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
          */
         private volatile List<PluginWrapper> transientDependencies;
 
-        public DependencyClassLoader(ClassLoader parent, File archive, List<Dependency> dependencies) {
+        DependencyClassLoader(ClassLoader parent, File archive, List<Dependency> dependencies) {
             super(parent);
             this._for = archive;
             this.dependencies = dependencies;
diff --git a/core/src/main/java/hudson/EnvVars.java b/core/src/main/java/hudson/EnvVars.java
index d3945a561a..a323c4d39f 100644
--- a/core/src/main/java/hudson/EnvVars.java
+++ b/core/src/main/java/hudson/EnvVars.java
@@ -195,7 +195,7 @@ public class EnvVars extends TreeMap<String,String> {
             private final Comparator<? super String> comparator;
             public Set<String> referredVariables;
             
-            public TraceResolver(Comparator<? super String> comparator) {
+            TraceResolver(Comparator<? super String> comparator) {
                 this.comparator = comparator;
                 clear();
             }
@@ -214,7 +214,7 @@ public class EnvVars extends TreeMap<String,String> {
             // map from a variable to a set of variables that variable refers.
             private final Map<String, Set<String>> refereeSetMap;
             
-            public VariableReferenceSorter(Map<String, Set<String>> refereeSetMap) {
+            VariableReferenceSorter(Map<String, Set<String>> refereeSetMap) {
                 this.refereeSetMap = refereeSetMap;
             }
             
@@ -239,7 +239,7 @@ public class EnvVars extends TreeMap<String,String> {
         private Map<String, Set<String>> refereeSetMap;
         private List<String> orderedVariableNames;
         
-        public OverrideOrderCalculator(@NonNull EnvVars target, @NonNull Map<String,String> overrides) {
+        OverrideOrderCalculator(@NonNull EnvVars target, @NonNull Map<String,String> overrides) {
             comparator = target.comparator();
             this.target = target;
             this.overrides = overrides;
diff --git a/core/src/main/java/hudson/ExpressionFactory2.java b/core/src/main/java/hudson/ExpressionFactory2.java
index e372218249..a3bd134319 100644
--- a/core/src/main/java/hudson/ExpressionFactory2.java
+++ b/core/src/main/java/hudson/ExpressionFactory2.java
@@ -52,7 +52,7 @@ final class ExpressionFactory2 implements ExpressionFactory {
         /** The Jexl expression object */
         private org.apache.commons.jexl.Expression expression;
 
-        public JexlExpression(org.apache.commons.jexl.Expression expression) {
+        JexlExpression(org.apache.commons.jexl.Expression expression) {
             this.expression = expression;
         }
 
diff --git a/core/src/main/java/hudson/ExtensionFinder.java b/core/src/main/java/hudson/ExtensionFinder.java
index 4d3802fcb5..048e69bc9f 100644
--- a/core/src/main/java/hudson/ExtensionFinder.java
+++ b/core/src/main/java/hudson/ExtensionFinder.java
@@ -459,7 +459,7 @@ public abstract class ExtensionFinder implements ExtensionPoint {
             private final List<IndexItem<?,Object>> index;
             private final List<IndexItem<?,Object>> loadedIndex;
 
-            public SezpozModule(List<IndexItem<?,Object>> index) {
+            SezpozModule(List<IndexItem<?,Object>> index) {
                 this.index = index;
                 this.loadedIndex = new ArrayList<>();
             }
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index fcb959c519..3fb9ba4e1b 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -748,7 +748,7 @@ public final class FilePath implements SerializableOnlyOverRemoting {
         private final String verificationRoot;
         private final boolean noFollowLinks;
 
-        public HasSymlink(String verificationRoot, boolean noFollowLinks) {
+        HasSymlink(String verificationRoot, boolean noFollowLinks) {
             this.verificationRoot = verificationRoot;
             this.noFollowLinks = noFollowLinks;
         }
@@ -768,7 +768,7 @@ public final class FilePath implements SerializableOnlyOverRemoting {
         private final String verificationRoot;
         private final boolean noFollowLinks;
 
-        public SymlinkRetainingFileFilter(FilePath verificationRoot, boolean noFollowLinks) {
+        SymlinkRetainingFileFilter(FilePath verificationRoot, boolean noFollowLinks) {
             this.verificationRoot = verificationRoot == null ? null : verificationRoot.remote;
             this.noFollowLinks = noFollowLinks;
         }
@@ -3302,7 +3302,7 @@ public final class FilePath implements SerializableOnlyOverRemoting {
         private final FileCallable<T> callable;
         private transient ClassLoader classLoader;
 
-        public FileCallableWrapper(FileCallable<T> callable) {
+        FileCallableWrapper(FileCallable<T> callable) {
             this.callable = callable;
             this.classLoader = callable.getClass().getClassLoader();
         }
@@ -3672,7 +3672,7 @@ public final class FilePath implements SerializableOnlyOverRemoting {
         private final String verificationRoot;
         private final boolean noFollowLinks;
 
-        public SymlinkDiscardingFileFilter(FilePath verificationRoot, boolean noFollowLinks) {
+        SymlinkDiscardingFileFilter(FilePath verificationRoot, boolean noFollowLinks) {
             this.verificationRoot = verificationRoot == null ? null : verificationRoot.remote;
             this.noFollowLinks = noFollowLinks;
         }
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 0ff6f00568..3fca0f0afd 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -1450,7 +1450,7 @@ public class Functions {
     private static class ThreadSorterBase {
         protected Map<Long,String> map = new HashMap<>();
 
-        public ThreadSorterBase() {
+        ThreadSorterBase() {
             ThreadGroup tg = Thread.currentThread().getThreadGroup();
             while (tg.getParent() != null) tg = tg.getParent();
             Thread[] threads = new Thread[tg.activeCount()*2];
diff --git a/core/src/main/java/hudson/Launcher.java b/core/src/main/java/hudson/Launcher.java
index d248bd5192..70aa043018 100644
--- a/core/src/main/java/hudson/Launcher.java
+++ b/core/src/main/java/hudson/Launcher.java
@@ -1155,7 +1155,7 @@ public abstract class Launcher {
         private static final class KillTask extends MasterToSlaveCallable<Void,RuntimeException> {
             private final Map<String, String> modelEnvVars;
 
-            public KillTask(Map<String, String> modelEnvVars) {
+            KillTask(Map<String, String> modelEnvVars) {
                 this.modelEnvVars = modelEnvVars;
             }
 
@@ -1440,7 +1440,7 @@ public abstract class Launcher {
         @NonNull
         private final Map<String,String> envOverrides;
 
-        public RemoteChannelLaunchCallable(@NonNull String[] cmd, @NonNull Pipe out, @NonNull OutputStream err, 
+        RemoteChannelLaunchCallable(@NonNull String[] cmd, @NonNull Pipe out, @NonNull OutputStream err, 
                 @CheckForNull String workDir, @NonNull Map<String,String> envOverrides) {
             this.cmd = cmd;
             this.out = out;
diff --git a/core/src/main/java/hudson/MarkupText.java b/core/src/main/java/hudson/MarkupText.java
index b83301a0ac..17a4d4a80a 100644
--- a/core/src/main/java/hudson/MarkupText.java
+++ b/core/src/main/java/hudson/MarkupText.java
@@ -59,7 +59,7 @@ public class MarkupText extends AbstractMarkupText {
         private final String markup;
 
 
-        public Tag(int pos, String markup) {
+        Tag(int pos, String markup) {
             this.pos = pos;
             this.markup = markup;
         }
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index 352055c562..eb4a5dee22 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1115,7 +1115,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
             final JarURLConnection jarURLConnection = (JarURLConnection) uc;
             final String entryName = jarURLConnection.getEntryName();
             
-            try(final JarFile jarFile = jarURLConnection.getJarFile()) {
+            try(JarFile jarFile = jarURLConnection.getJarFile()) {
                 final JarEntry entry = (entryName != null && jarFile != null) ? jarFile.getJarEntry(entryName) : null;
                 if (entry != null) {
                     try(InputStream i = jarFile.getInputStream(entry)) {
diff --git a/core/src/main/java/hudson/Proc.java b/core/src/main/java/hudson/Proc.java
index f4792bf8b8..26d8c14c5c 100644
--- a/core/src/main/java/hudson/Proc.java
+++ b/core/src/main/java/hudson/Proc.java
@@ -395,7 +395,7 @@ public abstract class Proc {
             private final InputStream in;
             private final OutputStream out;
 
-            public StdinCopyThread(String threadName, InputStream in, OutputStream out) {
+            StdinCopyThread(String threadName, InputStream in, OutputStream out) {
                 super(threadName);
                 this.in = in;
                 this.out = out;
diff --git a/core/src/main/java/hudson/TcpSlaveAgentListener.java b/core/src/main/java/hudson/TcpSlaveAgentListener.java
index 384691a801..63c224b6e8 100644
--- a/core/src/main/java/hudson/TcpSlaveAgentListener.java
+++ b/core/src/main/java/hudson/TcpSlaveAgentListener.java
@@ -237,7 +237,7 @@ public final class TcpSlaveAgentListener extends Thread {
          */
         private final int id;
 
-        public ConnectionHandler(Socket s, ConnectionHandlerFailureCallback parentTerminator) {
+        ConnectionHandler(Socket s, ConnectionHandlerFailureCallback parentTerminator) {
             this.s = s;
             synchronized(getClass()) {
                 id = iotaGen++;
@@ -359,7 +359,7 @@ public final class TcpSlaveAgentListener extends Thread {
     private abstract static class ConnectionHandlerFailureCallback {
         private Thread parentThread;
 
-        public ConnectionHandlerFailureCallback(Thread parentThread) {
+        ConnectionHandlerFailureCallback(Thread parentThread) {
             this.parentThread = parentThread;
         }
 
diff --git a/core/src/main/java/hudson/XmlFile.java b/core/src/main/java/hudson/XmlFile.java
index 89be52478b..d203806906 100644
--- a/core/src/main/java/hudson/XmlFile.java
+++ b/core/src/main/java/hudson/XmlFile.java
@@ -296,7 +296,7 @@ public final class XmlFile {
     public String sniffEncoding() throws IOException {
         class Eureka extends SAXException {
             final String encoding;
-            public Eureka(String encoding) {
+            Eureka(String encoding) {
                 this.encoding = encoding;
             }
         }
diff --git a/core/src/main/java/hudson/cli/declarative/MethodBinder.java b/core/src/main/java/hudson/cli/declarative/MethodBinder.java
index f9b8885e8e..a75e14f8a6 100644
--- a/core/src/main/java/hudson/cli/declarative/MethodBinder.java
+++ b/core/src/main/java/hudson/cli/declarative/MethodBinder.java
@@ -55,7 +55,7 @@ class MethodBinder {
     /**
      * @param method
      */
-    public MethodBinder(Method method, CLICommand command, CmdLineParser parser) {
+    MethodBinder(Method method, CLICommand command, CmdLineParser parser) {
         this.method = method;
         this.command = command;
 
diff --git a/core/src/main/java/hudson/init/InitStrategy.java b/core/src/main/java/hudson/init/InitStrategy.java
index d4ba7d85b9..9c6879c485 100644
--- a/core/src/main/java/hudson/init/InitStrategy.java
+++ b/core/src/main/java/hudson/init/InitStrategy.java
@@ -128,7 +128,7 @@ public class InitStrategy {
     private static class FilterByExtension implements FilenameFilter {
         private final List<String> extensions;
 
-        public FilterByExtension(String... extensions) {
+        FilterByExtension(String... extensions) {
             this.extensions = Arrays.asList(extensions);
         }
 
diff --git a/core/src/main/java/hudson/init/TaskMethodFinder.java b/core/src/main/java/hudson/init/TaskMethodFinder.java
index b8370294c8..c5c3cffdef 100644
--- a/core/src/main/java/hudson/init/TaskMethodFinder.java
+++ b/core/src/main/java/hudson/init/TaskMethodFinder.java
@@ -37,7 +37,7 @@ abstract class TaskMethodFinder<T extends Annotation> extends TaskBuilder {
     private final Class<T> type;
     private final Class<? extends Enum> milestoneType;
 
-    public TaskMethodFinder(Class<T> type, Class<? extends Enum> milestoneType, ClassLoader cl) {
+    TaskMethodFinder(Class<T> type, Class<? extends Enum> milestoneType, ClassLoader cl) {
         this.type = type;
         this.milestoneType = milestoneType;
         this.cl = cl;
diff --git a/core/src/main/java/hudson/model/FingerprintMap.java b/core/src/main/java/hudson/model/FingerprintMap.java
index 04ea596ff0..038d70a5f0 100644
--- a/core/src/main/java/hudson/model/FingerprintMap.java
+++ b/core/src/main/java/hudson/model/FingerprintMap.java
@@ -97,7 +97,7 @@ static class FingerprintParams {
     final @CheckForNull Run build;
     final String fileName;
 
-    public FingerprintParams(@CheckForNull Run build, @NonNull String fileName) {
+    FingerprintParams(@CheckForNull Run build, @NonNull String fileName) {
         this.build = build;
         this.fileName = fileName;
 
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index bd4102723e..dc3d4edd8a 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -1080,7 +1080,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
             ChangeLogSet.Entry e;
             int idx;
 
-            public FeedItem(ChangeLogSet.Entry e, int idx) {
+            FeedItem(ChangeLogSet.Entry e, int idx) {
                 this.e = e;
                 this.idx = idx;
             }
@@ -1405,7 +1405,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
                 class ChartLabel implements Comparable<ChartLabel> {
                     final Run run;
 
-                    public ChartLabel(Run r) {
+                    ChartLabel(Run r) {
                         this.run = r;
                     }
 
diff --git a/core/src/main/java/hudson/model/LargeText.java b/core/src/main/java/hudson/model/LargeText.java
index 8c203c0b03..3acfa91d5f 100644
--- a/core/src/main/java/hudson/model/LargeText.java
+++ b/core/src/main/java/hudson/model/LargeText.java
@@ -222,7 +222,7 @@ public class LargeText {
         protected ByteBuf buf;
         protected int pos;
 
-        public Mark(ByteBuf buf) {
+        Mark(ByteBuf buf) {
             this.buf = buf;
         }
     }
@@ -232,7 +232,7 @@ public class LargeText {
      * to the output yet.
      */
     private static final class HeadMark extends Mark {
-        public HeadMark(ByteBuf buf) {
+        HeadMark(ByteBuf buf) {
             super(buf);
         }
 
@@ -259,7 +259,7 @@ public class LargeText {
      * Points to the end of the region.
      */
     private static final class TailMark extends Mark {
-        public TailMark(ByteBuf buf) {
+        TailMark(ByteBuf buf) {
             super(buf);
         }
 
@@ -287,7 +287,7 @@ public class LargeText {
         private int size = 0;
         private ByteBuf next;
 
-        public ByteBuf(ByteBuf previous, Session f) throws IOException {
+        ByteBuf(ByteBuf previous, Session f) throws IOException {
             if(previous!=null) {
                 assert previous.next==null;
                 previous.next = this;
@@ -323,7 +323,7 @@ public class LargeText {
     private static final class FileSession implements Session {
         private final RandomAccessFile file;
 
-        public FileSession(File file) throws IOException {
+        FileSession(File file) throws IOException {
             this.file = new RandomAccessFile(file,"r");
         }
 
@@ -351,7 +351,7 @@ public class LargeText {
         private final InputStream in;
 
         @SuppressWarnings("deprecation")
-        public BufferSession(ByteBuffer buf) {
+        BufferSession(ByteBuffer buf) {
             this.in = buf.newInputStream();
         }
 
diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
index 92a8f4efb4..5eb80076d4 100644
--- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
+++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java
@@ -246,7 +246,7 @@ public class ParametersDefinitionProperty extends OptionalJobProperty<Job<?, ?>>
     private static class DefinitionsAbstractList extends AbstractList<String> {
         private final List<ParameterDefinition> parameterDefinitions;
 
-        public DefinitionsAbstractList(List<ParameterDefinition> parameterDefinitions) {
+        DefinitionsAbstractList(List<ParameterDefinition> parameterDefinitions) {
             this.parameterDefinitions = parameterDefinitions;
         }
 
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index a315976171..1f85790015 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -2997,7 +2997,7 @@ public class Queue extends ResourceController implements Saveable {
         private final List<BuildableItem> buildables;
         private final List<BuildableItem> pendings;
 
-        public Snapshot(Set<WaitingItem> waitingList, List<BlockedItem> blockedProjects, List<BuildableItem> buildables,
+        Snapshot(Set<WaitingItem> waitingList, List<BlockedItem> blockedProjects, List<BuildableItem> buildables,
                         List<BuildableItem> pendings) {
             this.waitingList = new LinkedHashSet<>(waitingList);
             this.blockedProjects = new ArrayList<>(blockedProjects);
diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java
index b95f685cb4..ea45b65157 100644
--- a/core/src/main/java/hudson/model/RunMap.java
+++ b/core/src/main/java/hudson/model/RunMap.java
@@ -169,12 +169,12 @@ public final class RunMap<R extends Run<?,R>> extends AbstractLazyLoadRunMap<R>
     }
 
     @Override
-    protected final int getNumberOf(R r) {
+    protected int getNumberOf(R r) {
         return r.getNumber();
     }
 
     @Override
-    protected final String getIdOf(R r) {
+    protected String getIdOf(R r) {
         return r.getId();
     }
 
diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java
index 701b326e00..1f33ba3e7a 100644
--- a/core/src/main/java/hudson/model/Slave.java
+++ b/core/src/main/java/hudson/model/Slave.java
@@ -709,7 +709,7 @@ public abstract class Slave extends Node implements Serializable {
         private final long remoteTime = System.currentTimeMillis();
         private final long startTime;
 
-        public GetClockDifference3(long startTime) {
+        GetClockDifference3(long startTime) {
             this.startTime = startTime;
         }
 
diff --git a/core/src/main/java/hudson/model/queue/FutureImpl.java b/core/src/main/java/hudson/model/queue/FutureImpl.java
index d72a337f03..171dccd03d 100644
--- a/core/src/main/java/hudson/model/queue/FutureImpl.java
+++ b/core/src/main/java/hudson/model/queue/FutureImpl.java
@@ -64,7 +64,7 @@ public final class FutureImpl extends AsyncFutureImpl<Executable> implements Que
         return start;
     }
 
-    public final Executable waitForStart() throws InterruptedException, ExecutionException {
+    public Executable waitForStart() throws InterruptedException, ExecutionException {
         return getStartCondition().get();
     }
 
diff --git a/core/src/main/java/hudson/model/queue/Latch.java b/core/src/main/java/hudson/model/queue/Latch.java
index 49f2d870b2..d6fe39a4a9 100644
--- a/core/src/main/java/hudson/model/queue/Latch.java
+++ b/core/src/main/java/hudson/model/queue/Latch.java
@@ -49,7 +49,7 @@ class Latch {
      *      Number of threads that need to enter the {@link #synchronize()} method
      *      before all of them get released.
      */
-    public Latch(int n) {
+    Latch(int n) {
         this.n = n;
     }
 
diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
index bba32306f0..7410251f42 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -294,7 +294,7 @@ public abstract class AbstractNodeMonitorDescriptor<T> extends Descriptor<NodeMo
 
         private long timestamp;
 
-        public Record() {
+        Record() {
             super("Monitoring thread for "+getDisplayName()+" started on "+new Date());
         }
 
diff --git a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
index 7cafa06e08..3dfc517241 100644
--- a/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
+++ b/core/src/main/java/hudson/node_monitors/ResponseTimeMonitor.java
@@ -115,7 +115,7 @@ public class ResponseTimeMonitor extends NodeMonitor {
         private final Data cur;
         private final long start = System.currentTimeMillis();
 
-        public Step2(Data cur) {
+        Step2(Data cur) {
             this.cur = cur;
         }
 
diff --git a/core/src/main/java/hudson/scm/AutoBrowserHolder.java b/core/src/main/java/hudson/scm/AutoBrowserHolder.java
index d704ad4516..cd14a15c28 100644
--- a/core/src/main/java/hudson/scm/AutoBrowserHolder.java
+++ b/core/src/main/java/hudson/scm/AutoBrowserHolder.java
@@ -45,7 +45,7 @@ final class AutoBrowserHolder {
     private RepositoryBrowser cache;
     private SCM owner;
 
-    public AutoBrowserHolder(SCM owner) {
+    AutoBrowserHolder(SCM owner) {
         this.owner = owner;
     }
 
diff --git a/core/src/main/java/hudson/search/ParsedQuickSilver.java b/core/src/main/java/hudson/search/ParsedQuickSilver.java
index ae6b3d97b2..f99f4b1505 100644
--- a/core/src/main/java/hudson/search/ParsedQuickSilver.java
+++ b/core/src/main/java/hudson/search/ParsedQuickSilver.java
@@ -113,7 +113,7 @@ final class ParsedQuickSilver {
     static final class MethodGetter extends Getter {
         private final Method method;
 
-        public MethodGetter(String url, String searchName, Method method) {
+        MethodGetter(String url, String searchName, Method method) {
             super(url, searchName);
             this.method = method;
         }
@@ -137,7 +137,7 @@ final class ParsedQuickSilver {
     static final class FieldGetter extends Getter {
         private final Field field;
 
-        public FieldGetter(String url, String searchName, Field field) {
+        FieldGetter(String url, String searchName, Field field) {
             super(url, searchName);
             this.field = field;
         }
diff --git a/core/src/main/java/hudson/search/Search.java b/core/src/main/java/hudson/search/Search.java
index 49848b84e2..a50b5bebac 100644
--- a/core/src/main/java/hudson/search/Search.java
+++ b/core/src/main/java/hudson/search/Search.java
@@ -323,7 +323,7 @@ public class Search implements StaplerProxy {
     static final class TokenList {
         private final String[] tokens;
 
-        public TokenList(String tokenList) {
+        TokenList(String tokenList) {
             tokens = tokenList!=null ? tokenList.split("(?<=\\s)(?=\\S)") : MemoryReductionUtil.EMPTY_STRING_ARRAY;
         }
 
diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
index dcf341f708..b920f0c0c2 100644
--- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java
+++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java
@@ -64,7 +64,7 @@ public class CrumbFilter implements Filter {
     }
 
     private static class Security1774ServletRequest extends HttpServletRequestWrapper {
-        public Security1774ServletRequest(HttpServletRequest request) {
+        Security1774ServletRequest(HttpServletRequest request) {
             super(request);
         }
 
diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
index 613bf921d5..0b0769a901 100644
--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
+++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -1026,7 +1026,7 @@ public class SlaveComputer extends Computer {
     private static class SlaveInitializer extends MasterToSlaveCallable<Void,RuntimeException> {
         final int ringBufferSize;
 
-        public SlaveInitializer(int ringBufferSize) {
+        SlaveInitializer(int ringBufferSize) {
             this.ringBufferSize = ringBufferSize;
         }
 
diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java
index 64b73adbb5..5c039b23ca 100644
--- a/core/src/main/java/hudson/tasks/Fingerprinter.java
+++ b/core/src/main/java/hudson/tasks/Fingerprinter.java
@@ -251,7 +251,7 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD
         final String fileName;
         final String md5sum;
 
-        public Record(boolean produced, String relativePath, String fileName, String md5sum) {
+        Record(boolean produced, String relativePath, String fileName, String md5sum) {
             this.produced = produced;
             this.relativePath = relativePath;
             this.fileName = fileName;
diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java
index 5fe319bcc0..1aa129feb2 100644
--- a/core/src/main/java/hudson/tasks/Maven.java
+++ b/core/src/main/java/hudson/tasks/Maven.java
@@ -254,7 +254,7 @@ public class Maven extends Builder {
         // command line arguments.
         private final String arguments;
 
-        public DecideDefaultMavenCommand(String arguments) {
+        DecideDefaultMavenCommand(String arguments) {
             this.arguments = arguments;
         }
 
diff --git a/core/src/main/java/hudson/util/Digester2.java b/core/src/main/java/hudson/util/Digester2.java
index ba98181da2..23aa7f50ac 100644
--- a/core/src/main/java/hudson/util/Digester2.java
+++ b/core/src/main/java/hudson/util/Digester2.java
@@ -145,7 +145,7 @@ public class Digester2 extends Digester {
     private static final class ObjectCreateRule2 extends Rule {
         private final Class clazz;
         
-        public ObjectCreateRule2(Class clazz) {
+        ObjectCreateRule2(Class clazz) {
             this.clazz = clazz;
         }
 
diff --git a/core/src/main/java/hudson/util/ProcessTree.java b/core/src/main/java/hudson/util/ProcessTree.java
index 9fad3bcedd..36defb2e23 100644
--- a/core/src/main/java/hudson/util/ProcessTree.java
+++ b/core/src/main/java/hudson/util/ProcessTree.java
@@ -359,7 +359,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
         private class CheckVetoes extends SlaveToMasterCallable<String, IOException> {
             private IOSProcess process;
             
-            public CheckVetoes(IOSProcess processToCheck) {
+            CheckVetoes(IOSProcess processToCheck) {
                 process = processToCheck;
             }
         
@@ -724,7 +724,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
     }
 
     abstract static class Unix extends Local {
-        public Unix(boolean vetoersExist) {
+        Unix(boolean vetoersExist) {
             super(vetoersExist);
         }
 
@@ -942,7 +942,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
 
 
     static class Linux extends ProcfsUnix {
-        public Linux(boolean vetoersExist) {
+        Linux(boolean vetoersExist) {
             super(vetoersExist);
         }
         
@@ -1052,7 +1052,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
      *     when accessing this file.
      */
     static class AIX extends ProcfsUnix {
-        public AIX(boolean vetoersExist) {
+        AIX(boolean vetoersExist) {
             super(vetoersExist);
         }
         
@@ -1374,7 +1374,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
      *     when accessing this file.
      */
     static class Solaris extends ProcfsUnix {
-        public Solaris(boolean vetoersExist) {
+        Solaris(boolean vetoersExist) {
             super(vetoersExist);
         }
         
diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java
index 0204058ff7..171fdadf25 100644
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
@@ -214,7 +214,7 @@ public class RunList<R extends Run> extends AbstractList<R> {
     private static class PredicateAdapter<T> implements com.google.common.base.Predicate<T> {
         private final Predicate<T> predicate;
 
-        public PredicateAdapter(Predicate<T> predicate) {
+        PredicateAdapter(Predicate<T> predicate) {
             this.predicate = predicate;
         }
 
diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java
index f8795e8c27..01a68dffa7 100644
--- a/core/src/main/java/hudson/util/XStream2.java
+++ b/core/src/main/java/hudson/util/XStream2.java
@@ -327,7 +327,7 @@ public class XStream2 extends XStream {
     }
 
     static final class MapperInjectionPoint extends MapperDelegate {
-        public MapperInjectionPoint(Mapper wrapped) {
+        MapperInjectionPoint(Mapper wrapped) {
             super(wrapped);
         }
 
diff --git a/core/src/main/java/jenkins/install/InstallUtil.java b/core/src/main/java/jenkins/install/InstallUtil.java
index 9f23d07d94..4d43d03395 100644
--- a/core/src/main/java/jenkins/install/InstallUtil.java
+++ b/core/src/main/java/jenkins/install/InstallUtil.java
@@ -80,7 +80,7 @@ public class InstallUtil {
      */
     private static class ProviderChain<T> implements Provider<T> {
         private final Iterator<Function<Provider<T>,T>> functions;
-        public ProviderChain(Iterator<Function<Provider<T>,T>> functions) {
+        ProviderChain(Iterator<Function<Provider<T>,T>> functions) {
             this.functions = functions;
         }
         @Override
diff --git a/core/src/main/java/jenkins/model/lazy/SortedIntList.java b/core/src/main/java/jenkins/model/lazy/SortedIntList.java
index 138142581b..d543048c76 100644
--- a/core/src/main/java/jenkins/model/lazy/SortedIntList.java
+++ b/core/src/main/java/jenkins/model/lazy/SortedIntList.java
@@ -37,7 +37,7 @@ class SortedIntList extends AbstractList<Integer> {
     private int[] data;
     private int size;
 
-    public SortedIntList(int capacity) {
+    SortedIntList(int capacity) {
         this.data = new int[capacity];
         this.size = 0;
     }
@@ -45,7 +45,7 @@ class SortedIntList extends AbstractList<Integer> {
     /**
      * Internal copy constructor.
      */
-    public SortedIntList(SortedIntList that) {
+    SortedIntList(SortedIntList that) {
         this.data = new int[that.size+8];
         System.arraycopy(that.data, 0, this.data, 0,
                          that.size);
diff --git a/core/src/main/java/jenkins/model/lazy/SortedList.java b/core/src/main/java/jenkins/model/lazy/SortedList.java
index 7d7424222a..c5b7fb02ce 100644
--- a/core/src/main/java/jenkins/model/lazy/SortedList.java
+++ b/core/src/main/java/jenkins/model/lazy/SortedList.java
@@ -37,7 +37,7 @@ import java.util.List;
 class SortedList<T extends Comparable<T>> extends AbstractList<T> {
     private List<T> data;
 
-    public SortedList(List<T> data) {
+    SortedList(List<T> data) {
         this.data = new ArrayList<>(data);
         assert isSorted();
     }
diff --git a/core/src/main/java/jenkins/security/s2m/ConfigFile.java b/core/src/main/java/jenkins/security/s2m/ConfigFile.java
index 419391c5eb..fb44bffe77 100644
--- a/core/src/main/java/jenkins/security/s2m/ConfigFile.java
+++ b/core/src/main/java/jenkins/security/s2m/ConfigFile.java
@@ -20,7 +20,7 @@ abstract class ConfigFile<T,COL extends Collection<T>> extends TextFile {
     @CopyOnWrite
     protected volatile COL parsed;
 
-    public ConfigFile(File file) {
+    ConfigFile(File file) {
         super(file);
     }
 
diff --git a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
index b44fcfcc51..0da6efa0e6 100644
--- a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
+++ b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
@@ -198,7 +198,7 @@ public class DefaultJnlpSlaveReceiver extends JnlpAgentReceiver {
         @CheckForNull
         private OutputStream log;
 
-        public State(@NonNull SlaveComputer node) {
+        State(@NonNull SlaveComputer node) {
             this.node = node;
         }
 
diff --git a/core/src/main/java/jenkins/util/AntClassLoader.java b/core/src/main/java/jenkins/util/AntClassLoader.java
index 7f24f08acf..e18ce3f4d7 100644
--- a/core/src/main/java/jenkins/util/AntClassLoader.java
+++ b/core/src/main/java/jenkins/util/AntClassLoader.java
@@ -1375,7 +1375,7 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
         // we can find the class we want.
         String classFilename = getClassFilename(name);
         for (File pathComponent : pathComponents) {
-            try (final InputStream stream = getResourceStream(pathComponent, classFilename)) {
+            try (InputStream stream = getResourceStream(pathComponent, classFilename)) {
                 if (stream != null) {
                     log("Loaded from " + pathComponent + " "
                         + classFilename, Project.MSG_DEBUG);
diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java
index 5a6e6bec4f..7c2735ba57 100644
--- a/core/src/main/java/jenkins/util/VirtualFile.java
+++ b/core/src/main/java/jenkins/util/VirtualFile.java
@@ -1117,7 +1117,7 @@ public abstract class VirtualFile implements Comparable<VirtualFile>, Serializab
             this.noFollowLinks = noFollowLinks;
         }
 
-        public Scanner(String includes, String excludes, boolean useDefaultExcludes) {
+        Scanner(String includes, String excludes, boolean useDefaultExcludes) {
             this(includes, excludes, useDefaultExcludes, null, false);
         }
 
diff --git a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
index d033800bc0..d0bf8f1a23 100644
--- a/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
+++ b/core/src/main/java/jenkins/util/xstream/XStreamDOM.java
@@ -323,7 +323,7 @@ public class XStreamDOM {
         private final Stack<Pointer> pointers = new Stack<>();
 
 
-        public ReaderImpl(XStreamDOM current) {
+        ReaderImpl(XStreamDOM current) {
             super(new XmlFriendlyReplacer());
             pointers.push(new Pointer(current));
         }
diff --git a/pom.xml b/pom.xml
index 4a2eb740c8..66ab549f1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -448,6 +448,7 @@ THE SOFTWARE.
                        Modifiers: https://checkstyle.sourceforge.io/config_modifier.html
                    -->
                    <module name="ModifierOrder"/>
+                   <module name="RedundantModifier"/>
                  </module>
                </module>
              </checkstyleRules>