diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index c0f03bb1752b..b3446031cd7d 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -15,7 +15,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.QuickFixFactory;
 import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider;
 import com.intellij.modcommand.ModCommandAction;
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.LanguageLevelUtil;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
@@ -52,7 +51,6 @@ import static com.intellij.util.ObjectUtils.tryCast;
 
 // generates HighlightInfoType.ERROR-like HighlightInfos
 public final class HighlightUtil {
-  private static final Logger LOG = Logger.getInstance(HighlightUtil.class);
 
   private static final @NlsSafe String ANONYMOUS = "anonymous ";
 
diff --git a/java/java-psi-impl/resources/messages/JavaErrorBundle.properties b/java/java-psi-impl/resources/messages/JavaErrorBundle.properties
index 2aa034bbc038..06d6a3d93638 100644
--- a/java/java-psi-impl/resources/messages/JavaErrorBundle.properties
+++ b/java/java-psi-impl/resources/messages/JavaErrorBundle.properties
@@ -25,22 +25,8 @@ class.must.implement.method=Class ''{0}'' must implement abstract method ''{1}''
 package.name.file.path.mismatch=Package name ''{0}'' does not correspond to the file path ''{1}''
 missing.package.statement=Missing package statement: ''{0}''
 missing.package.statement.package.name.invalid=Missing package statement but package name ''{0}'' which corresponds to the file path is invalid
-is.not.an.enclosing.class=''{0}'' is not an enclosing class
-cannot.be.referenced.from.static.context=''{0}'' cannot be referenced from a static context
 missing.return.statement=Missing return statement
-unreachable.statement=Unreachable statement
-unreachable.statement.false.condition=Loop condition is always false making the loop body unreachable
 variable.not.initialized=Variable ''{0}'' might not have been initialized
-variable.already.assigned=Variable ''{0}'' might already have been assigned to
-variable.assigned.in.loop=Variable ''{0}'' might be assigned in loop
-assignment.to.final.variable=Cannot assign a value to final variable ''{0}''
-variable.must.be.final=Variable ''{0}'' is accessed from within inner class, needs to be declared final
-variable.must.be.final.or.effectively.final=Variable ''{0}'' is accessed from within inner class, needs to be final or effectively final
-lambda.variable.must.be.final=Variable used in lambda expression should be final or effectively final
-resource.variable.must.be.final=Variable used as a try-with-resources resource should be final or effectively final
-guarded.pattern.variable.must.be.final=Variable used in guarded pattern should be final or effectively final
-declaration.or.variable.expected=Declaration, final or effectively final variable expected
-initializer.must.be.able.to.complete.normally=Initializer must be able to complete normally
 incompatible.return.type=attempting to use incompatible return type
 exception.is.never.thrown=Exception ''{0}'' is never thrown in the method
 cannot.resolve.method=Cannot resolve method ''{0}''
@@ -125,9 +111,6 @@ identifier.is.not.allowed.here=Identifier is not allowed here
 illegal.forward.reference=Cannot read value of field ''{0}'' before the field''s definition
 unknown.class=Unknown class: ''{0}''
 illegal.type.void=Illegal type: 'void'
-member.referenced.before.constructor.called=Cannot reference ''{0}'' before superclass constructor is called
-method.called.before.constructor.called=Cannot call ''{0}'' before superclass constructor is called
-assign.initialized.field.before.constructor.call=Cannot assign initialized field ''{0}'' before superclass constructor is called
 statement.must.be.prepended.with.case.label=Statement must be prepended with case label
 different.case.kinds.in.switch=Different 'case' kinds used in 'switch'
 numeric.overflow.in.expression=Numeric overflow in expression
@@ -137,8 +120,6 @@ deprecated.since.symbol=''{0}'' is deprecated since version {1}
 marked.for.removal.symbol=''{0}'' is deprecated and marked for removal
 marked.for.removal.symbol.since=''{0}'' is deprecated since version {1} and marked for removal
 cannot.resolve.symbol=Cannot resolve symbol ''{0}''
-class.in.default.package=Class ''{0}'' is in the default package
-
 local.variable.is.never.used=Variable ''{0}'' is never used
 local.variable.is.not.used.for.reading=Variable ''{0}'' is assigned but never accessed
 local.variable.is.not.assigned=Variable ''{0}'' is never assigned
@@ -264,10 +245,8 @@ module.bad.name=Module ''{0}'' has an invalid name
 restricted.identifier=''{0}'' is a restricted identifier and cannot be used for type declarations
 record.canonical.constructor=Canonical constructor
 record.compact.constructor=Compact constructor
-record.component.not.initialized=Record component ''{0}'' might not be initialized in canonical constructor
 insufficient.language.level={0} are not supported at language level ''{1}''
 
-cannot.select.from.a.type.parameter=Cannot select from a type parameter
 bad.type.in.switch.expression=Bad type in switch expression: {0} cannot be converted to {1}
 switch.expression.cannot.be.void=Target type for switch expression cannot be void
 annotation.on.static.member.qualifying.type.family.name=Move type annotation