diff --git a/check_api/src/main/java/com/google/errorprone/ErrorProneOptions.java b/check_api/src/main/java/com/google/errorprone/ErrorProneOptions.java
index 91e0f5c38d4..0c650497812 100644
--- a/check_api/src/main/java/com/google/errorprone/ErrorProneOptions.java
+++ b/check_api/src/main/java/com/google/errorprone/ErrorProneOptions.java
@@ -292,41 +292,41 @@ private void parseSeverity(String arg) {
       severityMap.put(checkName, severity);
     }
 
-    public void parseFlag(String flag) {
+    void parseFlag(String flag) {
       flagsBuilder.parseFlag(flag);
     }
 
-    public void setIgnoreSuppressionAnnotations(boolean ignoreSuppressionAnnotations) {
+    void setIgnoreSuppressionAnnotations(boolean ignoreSuppressionAnnotations) {
       this.ignoreSuppressionAnnotations = ignoreSuppressionAnnotations;
     }
 
-    public void setIgnoreUnknownChecks(boolean ignoreUnknownChecks) {
+    void setIgnoreUnknownChecks(boolean ignoreUnknownChecks) {
       this.ignoreUnknownChecks = ignoreUnknownChecks;
     }
 
-    public void setDisableWarningsInGeneratedCode(boolean disableWarningsInGeneratedCode) {
+    void setDisableWarningsInGeneratedCode(boolean disableWarningsInGeneratedCode) {
       this.disableWarningsInGeneratedCode = disableWarningsInGeneratedCode;
     }
 
-    public void setDropErrorsToWarnings(boolean dropErrorsToWarnings) {
+    void setDropErrorsToWarnings(boolean dropErrorsToWarnings) {
       severityMap.entrySet().stream()
           .filter(e -> e.getValue() == Severity.ERROR)
           .forEach(e -> e.setValue(Severity.WARN));
       this.dropErrorsToWarnings = dropErrorsToWarnings;
     }
 
-    public void setSuggestionsAsWarnings(boolean suggestionsAsWarnings) {
+    void setSuggestionsAsWarnings(boolean suggestionsAsWarnings) {
       this.suggestionsAsWarnings = suggestionsAsWarnings;
     }
 
-    public void setDisableAllWarnings(boolean disableAllWarnings) {
+    void setDisableAllWarnings(boolean disableAllWarnings) {
       severityMap.entrySet().stream()
           .filter(e -> e.getValue() == Severity.WARN)
           .forEach(e -> e.setValue(Severity.OFF));
       this.disableAllWarnings = disableAllWarnings;
     }
 
-    public void setEnableAllChecksAsWarnings(boolean enableAllChecksAsWarnings) {
+    void setEnableAllChecksAsWarnings(boolean enableAllChecksAsWarnings) {
       // Checks manually disabled before this flag are reset to warning-level
       severityMap.entrySet().stream()
           .filter(e -> e.getValue() == Severity.OFF)
@@ -334,29 +334,29 @@ public void setEnableAllChecksAsWarnings(boolean enableAllChecksAsWarnings) {
       this.enableAllChecksAsWarnings = enableAllChecksAsWarnings;
     }
 
-    public void setIgnoreLargeCodeGenerators(boolean ignoreLargeCodeGenerators) {
+    void setIgnoreLargeCodeGenerators(boolean ignoreLargeCodeGenerators) {
       this.ignoreLargeCodeGenerators = ignoreLargeCodeGenerators;
     }
 
-    public void setDisableAllChecks(boolean disableAllChecks) {
+    void setDisableAllChecks(boolean disableAllChecks) {
       // Discard previously set severities so that the DisableAllChecks flag is position sensitive.
       severityMap.clear();
       this.disableAllChecks = disableAllChecks;
     }
 
-    public void setTestOnlyTarget(boolean isTestOnlyTarget) {
+    void setTestOnlyTarget(boolean isTestOnlyTarget) {
       this.isTestOnlyTarget = isTestOnlyTarget;
     }
 
-    public void setPubliclyVisibleTarget(boolean isPubliclyVisibleTarget) {
+    void setPubliclyVisibleTarget(boolean isPubliclyVisibleTarget) {
       this.isPubliclyVisibleTarget = isPubliclyVisibleTarget;
     }
 
-    public PatchingOptions.Builder patchingOptionsBuilder() {
+    PatchingOptions.Builder patchingOptionsBuilder() {
       return patchingOptionsBuilder;
     }
 
-    public ErrorProneOptions build(ImmutableList<String> remainingArgs) {
+    ErrorProneOptions build(ImmutableList<String> remainingArgs) {
       return new ErrorProneOptions(
           ImmutableMap.copyOf(severityMap),
           remainingArgs,
@@ -376,7 +376,7 @@ public ErrorProneOptions build(ImmutableList<String> remainingArgs) {
           ignoreLargeCodeGenerators);
     }
 
-    public void setExcludedPattern(Pattern excludedPattern) {
+    void setExcludedPattern(Pattern excludedPattern) {
       this.excludedPattern = excludedPattern;
     }
   }
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/Contains.java b/check_api/src/main/java/com/google/errorprone/matchers/Contains.java
index dc39cfe92bc..93eeae9c006 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/Contains.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/Contains.java
@@ -46,7 +46,7 @@ private class FirstMatchingScanner extends TreeScanner<Boolean, Boolean> {
 
     private final VisitorState state;
 
-    public FirstMatchingScanner(VisitorState state) {
+    FirstMatchingScanner(VisitorState state) {
       this.state = state;
     }
 
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/Enclosing.java b/check_api/src/main/java/com/google/errorprone/matchers/Enclosing.java
index b7138eafd1e..c78becb0eef 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/Enclosing.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/Enclosing.java
@@ -35,10 +35,10 @@ private Enclosing() {}
 
   private abstract static class EnclosingMatcher<T extends Tree, U extends Tree>
       implements Matcher<U> {
-    protected final Matcher<T> matcher;
-    protected final java.lang.Class<T> clazz;
+    final Matcher<T> matcher;
+    final java.lang.Class<T> clazz;
 
-    protected EnclosingMatcher(Matcher<T> matcher, java.lang.Class<T> clazz) {
+    EnclosingMatcher(Matcher<T> matcher, java.lang.Class<T> clazz) {
       this.matcher = matcher;
       this.clazz = clazz;
     }
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java b/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java
index ff6292d053b..62b7cb11258 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/HasIdentifier.java
@@ -49,7 +49,7 @@ private static class HasIdentifierScanner extends TreePathScanner<Boolean, Void>
     private Matcher<IdentifierTree> idMatcher;
     private VisitorState ancestorState;
 
-    public HasIdentifierScanner(VisitorState ancestorState, Matcher<IdentifierTree> idMatcher) {
+    HasIdentifierScanner(VisitorState ancestorState, Matcher<IdentifierTree> idMatcher) {
       this.ancestorState = ancestorState;
       this.idMatcher = idMatcher;
     }
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java b/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java
index 57aba760c0e..950e6eb8290 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java
@@ -1352,7 +1352,7 @@ public static boolean isThrowingFunctionalInterface(Type clazzType, VisitorState
                   .collect(toImmutableSet()));
 
   private static class IsDirectImplementationOf extends ChildMultiMatcher<ClassTree, Tree> {
-    public IsDirectImplementationOf(Matcher<Tree> classMatcher) {
+    IsDirectImplementationOf(Matcher<Tree> classMatcher) {
       super(MatchType.AT_LEAST_ONE, classMatcher);
     }
 
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/MethodInvocation.java b/check_api/src/main/java/com/google/errorprone/matchers/MethodInvocation.java
index 10579827676..df7470bffc2 100644
--- a/check_api/src/main/java/com/google/errorprone/matchers/MethodInvocation.java
+++ b/check_api/src/main/java/com/google/errorprone/matchers/MethodInvocation.java
@@ -55,7 +55,7 @@ public boolean matches(ExpressionTree expressionTree, VisitorState state) {
   private static class MethodArgumentMatcher
       extends ChildMultiMatcher<MethodInvocationTree, ExpressionTree> {
 
-    public MethodArgumentMatcher(MatchType matchType, Matcher<ExpressionTree> nodeMatcher) {
+    MethodArgumentMatcher(MatchType matchType, Matcher<ExpressionTree> nodeMatcher) {
       super(matchType, nodeMatcher);
     }
 
diff --git a/check_api/src/main/java/com/google/errorprone/util/Reachability.java b/check_api/src/main/java/com/google/errorprone/util/Reachability.java
index 1e9f587e66e..d258e918168 100644
--- a/check_api/src/main/java/com/google/errorprone/util/Reachability.java
+++ b/check_api/src/main/java/com/google/errorprone/util/Reachability.java
@@ -118,7 +118,7 @@ private static class CanCompleteNormallyVisitor extends SimpleTreeVisitor<Boolea
     /** Trees that are patched to have a specific completion result. */
     private final ImmutableMap<Tree, Boolean> patches;
 
-    public CanCompleteNormallyVisitor(ImmutableMap<Tree, Boolean> patches) {
+    CanCompleteNormallyVisitor(ImmutableMap<Tree, Boolean> patches) {
       this.patches = patches;
     }
 
diff --git a/check_api/src/test/java/com/google/errorprone/util/ASTHelpersFindSuperMethodsTest.java b/check_api/src/test/java/com/google/errorprone/util/ASTHelpersFindSuperMethodsTest.java
index f9d6971b830..36d818e2589 100644
--- a/check_api/src/test/java/com/google/errorprone/util/ASTHelpersFindSuperMethodsTest.java
+++ b/check_api/src/test/java/com/google/errorprone/util/ASTHelpersFindSuperMethodsTest.java
@@ -194,15 +194,15 @@ private static class FindSuperMethodsTestScanner extends Scanner {
     // Last state passed to the `Scanner#scan` method.
     private VisitorState state;
 
-    public FindSuperMethodsTestScanner() {
+    FindSuperMethodsTestScanner() {
       this.methods = HashBasedTable.create();
     }
 
-    public MethodSymbol getMethod(String className, String methodName) {
+    MethodSymbol getMethod(String className, String methodName) {
       return methods.get(className, methodName);
     }
 
-    public VisitorState getState() {
+    VisitorState getState() {
       return state;
     }
 
diff --git a/check_api/src/test/java/com/google/errorprone/util/ASTHelpersTest.java b/check_api/src/test/java/com/google/errorprone/util/ASTHelpersTest.java
index 60ae5613016..8538d516b60 100644
--- a/check_api/src/test/java/com/google/errorprone/util/ASTHelpersTest.java
+++ b/check_api/src/test/java/com/google/errorprone/util/ASTHelpersTest.java
@@ -1043,7 +1043,7 @@ private abstract static class TestScanner extends Scanner {
      * Subclasses of {@link TestScanner} are expected to call this method within their overridden
      * visitXYZ() method in order to verify that the method has run at least once.
      */
-    protected void setAssertionsComplete() {
+    void setAssertionsComplete() {
       this.assertionsComplete = true;
     }
 
@@ -1052,7 +1052,7 @@ <T extends Tree> void assertMatch(T node, VisitorState visitorState, Matcher<T>
       assertThat(matcher.matches(node, state)).isTrue();
     }
 
-    public void verifyAssertionsComplete() {
+    void verifyAssertionsComplete() {
       assertWithMessage("Expected the visitor to call setAssertionsComplete().")
           .that(assertionsComplete)
           .isTrue();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DeadException.java b/core/src/main/java/com/google/errorprone/bugpatterns/DeadException.java
index d9ad7c3aea5..29f9ef0f4d2 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/DeadException.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/DeadException.java
@@ -93,7 +93,7 @@ public Description matchNewClass(NewClassTree newClassTree, VisitorState state)
 
   private static class ChildOfBlockOrCase<T extends Tree>
       extends ChildMultiMatcher<T, StatementTree> {
-    public ChildOfBlockOrCase(MatchType matchType, Matcher<StatementTree> nodeMatcher) {
+    ChildOfBlockOrCase(MatchType matchType, Matcher<StatementTree> nodeMatcher) {
       super(matchType, nodeMatcher);
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/DuplicateDateFormatField.java b/core/src/main/java/com/google/errorprone/bugpatterns/DuplicateDateFormatField.java
index 66e01253cdc..d2083d7308b 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/DuplicateDateFormatField.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/DuplicateDateFormatField.java
@@ -71,11 +71,11 @@ public void consumeLiteral(char literal) {
       prev = null;
     }
 
-    public Set<Character> getDuplicates() {
+    Set<Character> getDuplicates() {
       return duplicates;
     }
 
-    public static ImmutableSet<Character> getDuplicates(String pattern) {
+    static ImmutableSet<Character> getDuplicates(String pattern) {
       PatternCounter counter = new PatternCounter();
       parseDateFormat(pattern, counter);
       return ImmutableSet.copyOf(counter.getDuplicates());
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/EqualsReference.java b/core/src/main/java/com/google/errorprone/bugpatterns/EqualsReference.java
index 62fe2cfa84c..a3503d65062 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/EqualsReference.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/EqualsReference.java
@@ -63,7 +63,7 @@ private static class TreeScannerEquals extends TreeScanner<Void, VarSymbol> {
     private boolean hasIllegalEquals = false;
     private final MethodTree methodTree;
 
-    public TreeScannerEquals(MethodTree currMethodTree) {
+    TreeScannerEquals(MethodTree currMethodTree) {
       methodTree = currMethodTree;
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/Finally.java b/core/src/main/java/com/google/errorprone/bugpatterns/Finally.java
index c6c89a1d661..672caa88145 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/Finally.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/Finally.java
@@ -136,7 +136,7 @@ public boolean matches(T tree, VisitorState state) {
     }
 
     /** Match a tree in the ancestor chain given the ancestor's immediate descendant. */
-    protected MatchResult matchAncestor(Tree leaf, Tree prevTree) {
+    MatchResult matchAncestor(Tree leaf, Tree prevTree) {
       if (leaf instanceof TryTree tryTree) {
         if (tryTree.getFinallyBlock() != null && tryTree.getFinallyBlock().equals(prevTree)) {
           return MatchResult.FOUND_ERROR;
@@ -157,12 +157,12 @@ private enum JumpType {
       CONTINUE
     }
 
-    public FinallyJumpMatcher(JCContinue jcContinue) {
+    FinallyJumpMatcher(JCContinue jcContinue) {
       this.label = jcContinue.getLabel();
       this.jumpType = JumpType.CONTINUE;
     }
 
-    public FinallyJumpMatcher(JCBreak jcBreak) {
+    FinallyJumpMatcher(JCBreak jcBreak) {
       this.label = jcBreak.getLabel();
       this.jumpType = JumpType.BREAK;
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/FunctionalInterfaceMethodChanged.java b/core/src/main/java/com/google/errorprone/bugpatterns/FunctionalInterfaceMethodChanged.java
index 9dec3c1258c..244a3fb499b 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/FunctionalInterfaceMethodChanged.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/FunctionalInterfaceMethodChanged.java
@@ -97,7 +97,7 @@ private static class BehaviorPreservingChecker extends SimpleTreeVisitor<Boolean
     private boolean inBoxedVoidReturningMethod = false;
     private final Symbol methodToCall;
 
-    public BehaviorPreservingChecker(Symbol methodToCall) {
+    BehaviorPreservingChecker(Symbol methodToCall) {
       super(false);
       this.methodToCall = methodToCall;
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentHashCode.java b/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentHashCode.java
index ab30bae47ac..3570b937163 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentHashCode.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/InconsistentHashCode.java
@@ -226,7 +226,7 @@ private ImmutableSet<Symbol> accessedFields() {
       return accessedFields.build();
     }
 
-    public boolean failed() {
+    boolean failed() {
       return failed;
     }
   }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java
index 3d523a51b5d..b9234056616 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/LoopConditionChecker.java
@@ -106,7 +106,7 @@ static ImmutableSet<Symbol.VarSymbol> scan(Tree tree) {
 
     private final ImmutableSet.Builder<Symbol.VarSymbol> conditionVars;
 
-    public LoopConditionVisitor(ImmutableSet.Builder<Symbol.VarSymbol> conditionVars) {
+    LoopConditionVisitor(ImmutableSet.Builder<Symbol.VarSymbol> conditionVars) {
       this.conditionVars = conditionVars;
     }
 
@@ -145,7 +145,7 @@ public Boolean visitBinary(BinaryTree node, Void unused) {
   /** Scan for updates to the given variables. */
   private static class UpdateScanner extends TreeScanner<Void, Void> {
 
-    public static boolean scan(Tree tree, ImmutableSet<Symbol.VarSymbol> variables) {
+    static boolean scan(Tree tree, ImmutableSet<Symbol.VarSymbol> variables) {
       UpdateScanner scanner = new UpdateScanner(variables);
       tree.accept(scanner, null);
       return scanner.modified;
@@ -154,7 +154,7 @@ public static boolean scan(Tree tree, ImmutableSet<Symbol.VarSymbol> variables)
     private boolean modified = false;
     private final ImmutableSet<Symbol.VarSymbol> variables;
 
-    public UpdateScanner(ImmutableSet<Symbol.VarSymbol> variables) {
+    UpdateScanner(ImmutableSet<Symbol.VarSymbol> variables) {
       this.variables = variables;
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java
index 55f67fb297d..34b7953b05f 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/MethodCanBeStatic.java
@@ -328,7 +328,7 @@ public Description report(
       }
     };
 
-    public abstract Description report(
+    abstract Description report(
         Set<MethodTree> affectedTrees, SuggestedFix fix, VisitorState state, BugChecker checker);
   }
 }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingFail.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingFail.java
index 95bdf4c8f12..ad237fcd23b 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/MissingFail.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/MissingFail.java
@@ -496,7 +496,7 @@ private static boolean matches(List<? extends ExpressionTree> expressionTrees) {
 
   private static class ChildOfTryMatcher extends ChildMultiMatcher<TryTree, Tree> {
 
-    public ChildOfTryMatcher(MatchType matchType, Matcher<Tree> nodeMatcher) {
+    ChildOfTryMatcher(MatchType matchType, Matcher<Tree> nodeMatcher) {
       super(matchType, nodeMatcher);
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java
index 85dc8c348f6..0a9a37de834 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/MissingSuperCall.java
@@ -66,11 +66,11 @@ private enum AnnotationType {
       this.fullyQualifiedName = fullyQualifiedName;
     }
 
-    public String fullyQualifiedName() {
+    String fullyQualifiedName() {
       return fullyQualifiedName;
     }
 
-    public String simpleName() {
+    String simpleName() {
       int index = fullyQualifiedName().lastIndexOf('.');
       if (index >= 0) {
         return fullyQualifiedName().substring(index + 1);
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NestedInstanceOfConditions.java b/core/src/main/java/com/google/errorprone/bugpatterns/NestedInstanceOfConditions.java
index fba7fe1e584..ac8a3669551 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/NestedInstanceOfConditions.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/NestedInstanceOfConditions.java
@@ -79,7 +79,7 @@ public Description matchIf(IfTree ifTree, VisitorState visitorState) {
   private static class AssignmentTreeMatcher implements Matcher<Tree> {
     private final ExpressionTree variableExpressionTree;
 
-    public AssignmentTreeMatcher(ExpressionTree e) {
+    AssignmentTreeMatcher(ExpressionTree e) {
       variableExpressionTree = e;
     }
 
@@ -104,7 +104,7 @@ private static class NestedInstanceOfMatcher implements Matcher<Tree> {
     private final ExpressionTree expressionTree;
     private final Tree typeTree;
 
-    public NestedInstanceOfMatcher(ExpressionTree e, Tree t) {
+    NestedInstanceOfMatcher(ExpressionTree e, Tree t) {
       expressionTree = e;
       typeTree = t;
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/NonOverridingEquals.java b/core/src/main/java/com/google/errorprone/bugpatterns/NonOverridingEquals.java
index 2a92bc6c976..c4a6a09f6cd 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/NonOverridingEquals.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/NonOverridingEquals.java
@@ -179,7 +179,7 @@ private static class CastState {
     final String castToType;
     final SuggestedFix.Builder fix;
 
-    public CastState(Name name, String castToType, SuggestedFix.Builder fix) {
+    CastState(Name name, String castToType, SuggestedFix.Builder fix) {
       this.name = name;
       this.castToType = castToType;
       this.fix = fix;
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java b/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java
index 633aadaa05e..75d23da6896 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/TypeParameterUnusedInFormals.java
@@ -106,7 +106,7 @@ public Void visitClassType(Type.ClassType type, Void unused) {
       return null;
     }
 
-    public void visitIntersectionClassType(Type.IntersectionClassType type) {
+    void visitIntersectionClassType(Type.IntersectionClassType type) {
       for (Type component : type.getComponents()) {
         component.accept(this, null);
       }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnicodeEscape.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnicodeEscape.java
index 1063fee74da..256dc89808e 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/UnicodeEscape.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnicodeEscape.java
@@ -60,7 +60,7 @@ private UnicodeScanner(String source, VisitorState state) {
       this.currentCharacter = source.charAt(0);
     }
 
-    public void scan() {
+    void scan() {
       for (; position < source.length(); processCharacter()) {
         if (isUnicode && isBanned(currentCharacter)) {
           if (currentCharacter == '\\' && peek() == 'u') {
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java
index 75a9b46da7d..acf446384e2 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/UnnecessaryAnonymousClass.java
@@ -260,7 +260,7 @@ public Void visitIdentifier(IdentifierTree node, Void unused) {
       }
     }
 
-    public Optional<SuggestedFix> getFixes() {
+    Optional<SuggestedFix> getFixes() {
       return failed ? Optional.empty() : Optional.of(fix.build());
     }
   }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/AutoValueRules.java b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/AutoValueRules.java
index 0c692997e25..0fb4278231c 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/AutoValueRules.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/checkreturnvalue/AutoValueRules.java
@@ -95,7 +95,7 @@ public String id() {
       return '@' + simpleAnnotation;
     }
 
-    protected abstract ResultUsePolicy autoMethodPolicy(
+    abstract ResultUsePolicy autoMethodPolicy(
         MethodSymbol abstractMethod, ClassSymbol autoClass, VisitorState state);
 
     @Override
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java b/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java
index 2531fd077d5..577789f183f 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/flogger/FloggerRedundantIsEnabled.java
@@ -187,10 +187,9 @@ private static class LoggerIsEnabledBinaryIfConditionScanner extends TreeScanner
 
     private final ExpressionTree logInvocation;
     private final VisitorState state;
-    public Optional<SuggestedFix> fix;
+    Optional<SuggestedFix> fix;
 
-    public LoggerIsEnabledBinaryIfConditionScanner(
-        ExpressionTree logInvocation, VisitorState state) {
+    LoggerIsEnabledBinaryIfConditionScanner(ExpressionTree logInvocation, VisitorState state) {
       this.logInvocation = logInvocation;
       this.state = state;
       this.fix = Optional.empty();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java
index cb6d8bb4878..2a3590ad327 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/inlineme/InlineMeData.java
@@ -161,7 +161,7 @@ private static class QualifyingTreeCopier extends TreeCopier<Void> {
     private final VisitorState state;
     private final IdentityHashMap<IdentifierTree, JCExpression> qualifications;
 
-    public QualifyingTreeCopier(
+    QualifyingTreeCopier(
         VisitorState state, IdentityHashMap<IdentifierTree, JCExpression> qualifications) {
       super(state.getTreeMaker());
       this.state = state;
@@ -192,7 +192,7 @@ public JCTree visitIdentifier(IdentifierTree identifierTree, Void unused) {
   private static class GooglePrinter extends Pretty {
     private final StringWriter writer;
 
-    public GooglePrinter(StringWriter writer) {
+    GooglePrinter(StringWriter writer) {
       super(writer, false /* don't dump extra comments */);
       this.writer = writer;
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/overloading/ParameterTrie.java b/core/src/main/java/com/google/errorprone/bugpatterns/overloading/ParameterTrie.java
index d0fdf4ad52a..83e0a107eb1 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/overloading/ParameterTrie.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/overloading/ParameterTrie.java
@@ -86,7 +86,7 @@ private static class ParameterTrieExtender {
     private final NavigableSet<Parameter> inputParameters;
     private final List<Parameter> outputParameters;
 
-    public ParameterTrieExtender(MethodTree methodTree) {
+    ParameterTrieExtender(MethodTree methodTree) {
       this.methodTree = methodTree;
 
       this.inputParameters = new TreeSet<>(comparingInt(Parameter::position));
@@ -99,7 +99,7 @@ public ParameterTrieExtender(MethodTree methodTree) {
      * <p>If any {@link ParameterOrderingViolation} is found during the extension procedure, it is
      * reported in the result.
      */
-    public Optional<ParameterOrderingViolation> execute(ParameterTrie trie) {
+    Optional<ParameterOrderingViolation> execute(ParameterTrie trie) {
       Preconditions.checkArgument(trie != null);
 
       initialize();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java
index a410d17dc4a..0dc1346892f 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java
@@ -93,7 +93,7 @@ private static class BinderContext {
     final Names names;
     final GuardedByFlags flags;
 
-    public BinderContext(
+    BinderContext(
         Resolver resolver, ClassSymbol thisClass, Types types, Names names, GuardedByFlags flags) {
       this.resolver = resolver;
       this.thisClass = thisClass;
@@ -102,7 +102,7 @@ public BinderContext(
       this.flags = flags;
     }
 
-    public static BinderContext of(
+    static BinderContext of(
         Resolver resolver, ClassSymbol thisClass, Types types, Names names, GuardedByFlags flags) {
       return new BinderContext(resolver, thisClass, types, names, flags);
     }
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByExpression.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByExpression.java
index 55d420842c8..e41048bf1ec 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByExpression.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByExpression.java
@@ -193,7 +193,7 @@ GuardedByExpression qualifiedThis(Names names, ClassSymbol access, Symbol enclos
 
     private static class EnclosingInstanceSymbol extends VarSymbol {
 
-      public EnclosingInstanceSymbol(Names names, Symbol curr) {
+      EnclosingInstanceSymbol(Names names, Symbol curr) {
         super(
             Flags.SYNTHETIC,
             names.fromString(GuardedByExpression.ENCLOSING_INSTANCE_NAME),
@@ -279,7 +279,7 @@ public String debugPrint() {
   /** Pretty printer for lock expressions. */
   private static class PrettyPrinter {
 
-    public static String print(GuardedByExpression exp) {
+    static String print(GuardedByExpression exp) {
       StringBuilder sb = new StringBuilder();
       pprint(exp, sb);
       return sb.toString();
@@ -322,7 +322,7 @@ private static void pprintSelect(Select exp, StringBuilder sb) {
 
   /** s-exp pretty printer for lock expressions. */
   private static class DebugPrinter {
-    public static String print(GuardedByExpression exp) {
+    static String print(GuardedByExpression exp) {
       StringBuilder sb = new StringBuilder();
       pprint(exp, sb);
       return sb.toString();
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java
index 631de65cd71..3d73903f64c 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/HeldLockAnalyzer.java
@@ -305,7 +305,7 @@ private void invalidLock(ExpressionTree tree, HeldLockSet locks, String guardStr
    * @param unlockMethod The method that releases the lock.
    */
   private record LockResource(String className, String unlockMethod) {
-    public Matcher<ExpressionTree> createUnlockMatcher() {
+    Matcher<ExpressionTree> createUnlockMatcher() {
       return instanceMethod().onDescendantOf(className()).named(unlockMethod());
     }
 
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/time/TimeUnitMismatch.java b/core/src/main/java/com/google/errorprone/bugpatterns/time/TimeUnitMismatch.java
index 5d1c2b9d24d..c782cf90605 100644
--- a/core/src/main/java/com/google/errorprone/bugpatterns/time/TimeUnitMismatch.java
+++ b/core/src/main/java/com/google/errorprone/bugpatterns/time/TimeUnitMismatch.java
@@ -517,8 +517,7 @@ private static SuggestedFix convertTree(
    */
   private record TreeAndTimeUnit(
       ExpressionTree innermostTree, TimeUnit outermostUnit, TimeUnit innermostUnit) {
-    public static TreeAndTimeUnit of(
-        ExpressionTree tree, TimeUnit timeUnit, TimeUnit underlyingUnit) {
+    static TreeAndTimeUnit of(ExpressionTree tree, TimeUnit timeUnit, TimeUnit underlyingUnit) {
       return new TreeAndTimeUnit(tree, timeUnit, underlyingUnit);
     }
   }
diff --git a/core/src/main/java/com/google/errorprone/refaster/Template.java b/core/src/main/java/com/google/errorprone/refaster/Template.java
index f7de0c8c215..df2e28b0de5 100644
--- a/core/src/main/java/com/google/errorprone/refaster/Template.java
+++ b/core/src/main/java/com/google/errorprone/refaster/Template.java
@@ -410,7 +410,7 @@ public void visitTry(JCTry tree) {
   private static class InferException extends Exception {
     final Collection<JCDiagnostic> diagnostics;
 
-    public InferException(Collection<JCDiagnostic> diagnostics) {
+    InferException(Collection<JCDiagnostic> diagnostics) {
       this.diagnostics = diagnostics;
     }
 
diff --git a/core/src/main/java/com/google/errorprone/refaster/UUnary.java b/core/src/main/java/com/google/errorprone/refaster/UUnary.java
index 2ee63c96903..cd4ca077192 100644
--- a/core/src/main/java/com/google/errorprone/refaster/UUnary.java
+++ b/core/src/main/java/com/google/errorprone/refaster/UUnary.java
@@ -95,7 +95,7 @@ public <T extends JCTree> T copy(T t, Void v) {
           }
         }
 
-        public JCExpression defaultNegation(Tree expr) {
+        JCExpression defaultNegation(Tree expr) {
           return maker.Unary(JCTree.Tag.NOT, (JCExpression) expr);
         }
 
diff --git a/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java b/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java
index eb29f9e7e06..1f08bae0818 100644
--- a/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java
+++ b/core/src/test/java/com/google/errorprone/ErrorProneJavaCompilerTest.java
@@ -589,12 +589,11 @@ public String getCharContent(boolean ignoreEncodingErrors) {
   }
 
   private static class CompilationResult {
-    public final boolean succeeded;
-    public final String output;
-    public final DiagnosticTestHelper diagnosticHelper;
+    final boolean succeeded;
+    final String output;
+    final DiagnosticTestHelper diagnosticHelper;
 
-    public CompilationResult(
-        boolean succeeded, String output, DiagnosticTestHelper diagnosticHelper) {
+    CompilationResult(boolean succeeded, String output, DiagnosticTestHelper diagnosticHelper) {
       this.succeeded = succeeded;
       this.output = output;
       this.diagnosticHelper = diagnosticHelper;
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNullTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNullTest.java
index 32c3e603c52..ad6bc7050cf 100644
--- a/core/src/test/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNullTest.java
+++ b/core/src/test/java/com/google/errorprone/bugpatterns/nullness/UnnecessaryCheckNotNullTest.java
@@ -531,12 +531,12 @@ private static class Builder {
       private final ImmutableMap.Builder<String, Match> builder = ImmutableMap.builder();
 
       @CanIgnoreReturnValue
-      public Builder add(String expression, String... expected) {
+      Builder add(String expression, String... expected) {
         builder.put(expression, new Match(expected));
         return this;
       }
 
-      public TestScanner build() {
+      TestScanner build() {
         return new TestScanner(builder.buildOrThrow());
       }
     }
@@ -565,7 +565,7 @@ private static void assertMatch(ExpressionTree node, List<String> expected) {
           .isEqualTo(expected);
     }
 
-    public void assertFoundAll() {
+    void assertFoundAll() {
       for (Map.Entry<String, Match> entry : matches.entrySet()) {
         assertWithMessage("found " + entry.getKey()).that(entry.getValue().found).isTrue();
       }
diff --git a/core/src/test/java/com/google/errorprone/matchers/AnnotationMatcherTest.java b/core/src/test/java/com/google/errorprone/matchers/AnnotationMatcherTest.java
index 38c27fc2bd8..c97194a9460 100644
--- a/core/src/test/java/com/google/errorprone/matchers/AnnotationMatcherTest.java
+++ b/core/src/test/java/com/google/errorprone/matchers/AnnotationMatcherTest.java
@@ -458,7 +458,7 @@ public void shouldMatchAnnotationOnPackage() {
   }
 
   private abstract class ScannerTest extends Scanner {
-    public abstract void assertDone();
+    abstract void assertDone();
   }
 
   private Scanner nodeWithAnnotationMatches(boolean shouldMatch, AnnotationMatcher<Tree> toMatch) {
diff --git a/core/src/test/java/com/google/errorprone/matchers/ConstructorOfClassTest.java b/core/src/test/java/com/google/errorprone/matchers/ConstructorOfClassTest.java
index cd5f9ccd4a0..b0227243c19 100644
--- a/core/src/test/java/com/google/errorprone/matchers/ConstructorOfClassTest.java
+++ b/core/src/test/java/com/google/errorprone/matchers/ConstructorOfClassTest.java
@@ -139,7 +139,7 @@ public A(int i) {}
   }
 
   private abstract class ScannerTest extends Scanner {
-    public abstract void assertDone();
+    abstract void assertDone();
   }
 
   private Scanner classMatches(boolean shouldMatch, ConstructorOfClass toMatch) {
diff --git a/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java b/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
index 29e38f33b64..aeaab37f2c6 100644
--- a/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
+++ b/core/src/test/java/com/google/errorprone/matchers/MethodHasParametersTest.java
@@ -152,7 +152,7 @@ public void A(int i, Object obj) {}
   }
 
   private abstract class ScannerTest extends Scanner {
-    public abstract void assertDone();
+    abstract void assertDone();
   }
 
   private Scanner methodMatches(boolean shouldMatch, MethodHasParameters toMatch) {
diff --git a/test_helpers/src/main/java/com/google/errorprone/BugCheckerRefactoringTestHelper.java b/test_helpers/src/main/java/com/google/errorprone/BugCheckerRefactoringTestHelper.java
index 566419f7dcd..fdf6ab7804b 100644
--- a/test_helpers/src/main/java/com/google/errorprone/BugCheckerRefactoringTestHelper.java
+++ b/test_helpers/src/main/java/com/google/errorprone/BugCheckerRefactoringTestHelper.java
@@ -415,7 +415,7 @@ private static class OverrideIgnoringScannerSupplier extends ScannerSupplier {
 
     private final ScannerSupplier delegate;
 
-    public OverrideIgnoringScannerSupplier(ErrorProneScanner scanner) {
+    OverrideIgnoringScannerSupplier(ErrorProneScanner scanner) {
       delegate = ScannerSupplier.fromScanner(scanner);
     }
 
diff --git a/test_helpers/src/main/java/com/google/errorprone/DiagnosticTestHelper.java b/test_helpers/src/main/java/com/google/errorprone/DiagnosticTestHelper.java
index 4c11f062eb7..c063a29974d 100644
--- a/test_helpers/src/main/java/com/google/errorprone/DiagnosticTestHelper.java
+++ b/test_helpers/src/main/java/com/google/errorprone/DiagnosticTestHelper.java
@@ -359,11 +359,11 @@ public void report(Diagnostic<? extends S> diagnostic) {
       diagnostics.add(diagnostic);
     }
 
-    public List<Diagnostic<? extends S>> getDiagnostics() {
+    List<Diagnostic<? extends S>> getDiagnostics() {
       return ImmutableList.copyOf(diagnostics);
     }
 
-    public void clear() {
+    void clear() {
       diagnostics.clear();
     }
   }