diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java
index 51b56e1faa2e..ccb7ae39c9fb 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyOverrideImplementUtil.java
@@ -25,7 +25,6 @@ import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.fileTemplates.JavaTemplateUtil;
 import com.intellij.ide.util.MemberChooser;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyUtils.java
index 944ffa17a22f..4c8d10ef35eb 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyUtils.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/GroovyUtils.java
@@ -18,8 +18,9 @@ package org.jetbrains.plugins.groovy.util;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
-import com.intellij.psi.impl.compiled.ClsFileImpl;
+import com.intellij.psi.PsiCompiledFile;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
index 3cdbc6a30e49..99d7e918ad01 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.plugins.groovy.util;
 
-import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.DumbService;