diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java
index 446779744943..bce910610990 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java
@@ -27,12 +27,9 @@ import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.JBIterable;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 import static java.util.Arrays.asList;
 
 public class ClsJavaModuleImpl extends ClsRepositoryPsiElement<PsiJavaModuleStub> implements PsiJavaModule {
@@ -92,13 +89,11 @@ public class ClsJavaModuleImpl extends ClsRepositoryPsiElement<PsiJavaModuleStub
     setMirrorCheckingType(element, JavaElementType.MODULE);
     setMirror(getNameElement(), mirror.getNameElement());
 
-    List<PsiRequiresStatement> requires =
-      asList(getStub().getChildrenByType(JavaElementType.REQUIRES_STATEMENT, PsiRequiresStatement.EMPTY_ARRAY));
-    setMirrors(requires, PsiTreeUtil.getChildrenOfTypeAsList(mirror, PsiRequiresStatement.class));
+    setMirrors(asList(getStub().getChildrenByType(JavaElementType.REQUIRES_STATEMENT, PsiRequiresStatement.EMPTY_ARRAY)),
+               PsiTreeUtil.getChildrenOfTypeAsList(mirror, PsiRequiresStatement.class));
 
-    List<PsiExportsStatement> exports =
-      asList(getStub().getChildrenByType(JavaElementType.EXPORTS_STATEMENT, PsiExportsStatement.EMPTY_ARRAY));
-    setMirrors(exports, PsiTreeUtil.getChildrenOfTypeAsList(mirror, PsiExportsStatement.class));
+    setMirrors(asList(getStub().getChildrenByType(JavaElementType.EXPORTS_STATEMENT, PsiExportsStatement.EMPTY_ARRAY)),
+               PsiTreeUtil.getChildrenOfTypeAsList(mirror, PsiExportsStatement.class));
   }
 
   @Override
@@ -107,7 +102,7 @@ public class ClsJavaModuleImpl extends ClsRepositoryPsiElement<PsiJavaModuleStub
   }
 
   @Override
-  public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
+  public PsiElement setName(@NotNull String name) throws IncorrectOperationException {
     throw cannotModifyException(this);
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java
index a8b0c9160a4f..da54c5e98fd9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java
@@ -26,7 +26,7 @@ class ClsJavaModuleReferenceElementImpl extends ClsElementImpl implements PsiJav
   private final String myText;
   private final PsiJavaModuleReference myReference;
 
-  public ClsJavaModuleReferenceElementImpl(PsiElement parent, String text) {
+  ClsJavaModuleReferenceElementImpl(PsiElement parent, String text) {
     myParent = parent;
     myText = text;
     myReference = myParent instanceof PsiJavaModule ? null : new PsiJavaModuleReference(this);