diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java
index fc7bbffa2f3b..6b7a13c5bb83 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyImportOptimizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import gnu.trove.TObjectIntHashMap;
@@ -56,7 +57,7 @@ public class GroovyImportOptimizer implements ImportOptimizer {
 
   public static Set<GrImportStatement> findUsedImports(GroovyFile file) {
     Set<GrImportStatement> usedImports = new HashSet<GrImportStatement>();
-    processFile(file, null, null, usedImports, null, null, null, null);
+    processFile(file, null, null, usedImports, null, null, null, null, null);
     return usedImports;
   }
 
@@ -68,12 +69,15 @@ public class GroovyImportOptimizer implements ImportOptimizer {
                                   @Nullable final Set<String> importedClasses,
                                   @Nullable final Set<String> staticallyImportedMembers,
                                   @Nullable final Set<GrImportStatement> usedImports,
+                                  @Nullable final Set<GrImportStatement> unresolvedOnDemandImports,
                                   @Nullable final Set<String> implicitlyImported,
                                   @Nullable final Set<String> innerClasses,
                                   @Nullable final Map<String, String> aliased,
                                   @Nullable final Map<String, String> annotations) {
     if (!(file instanceof GroovyFile)) return;
 
+    final Set<String> unresolvedReferenceNames = ContainerUtil.newLinkedHashSet();
+
     file.accept(new PsiRecursiveElementWalkingVisitor() {
       @Override
       public void visitElement(PsiElement element) {
@@ -84,22 +88,30 @@ public class GroovyImportOptimizer implements ImportOptimizer {
       }
 
       private void visitRefElement(GrReferenceElement refElement) {
-        if ("super".equals(refElement.getReferenceName())) return;
+        final String refName = refElement.getReferenceName();
+
+        if ("super".equals(refName)) return;
 
         final GroovyResolveResult[] resolveResults = refElement.multiResolve(false);
+        if (resolveResults.length == 0 && refName != null) {
+          if (PsiTreeUtil.getParentOfType(refElement, GrImportStatement.class) == null) {
+            unresolvedReferenceNames.add(refName);
+          }
+        }
+
         for (GroovyResolveResult resolveResult : resolveResults) {
           final PsiElement context = resolveResult.getCurrentFileResolveContext();
-          final PsiElement element = resolveResult.getElement();
-          if (element == null) return;
+          final PsiElement resolved = resolveResult.getElement();
+          if (resolved == null) return;
 
           if (context instanceof GrImportStatement) {
             final GrImportStatement importStatement = (GrImportStatement)context;
 
-            if (usedImports != null && isImportUsed(refElement, element)) {
+            if (usedImports != null && isImportUsed(refElement, resolved)) {
               usedImports.add(importStatement);
             }
-            if (isImplicitlyImported(element, refElement.getReferenceName(), (GroovyFile)file)) {
-              addImplicitClass(element);
+            if (isImplicitlyImported(resolved, refName, (GroovyFile)file)) {
+              addImplicitClass(resolved);
             }
 
             if (!importStatement.isAliasedImport() && !isAnnotatedImport(importStatement)) {
@@ -107,8 +119,8 @@ public class GroovyImportOptimizer implements ImportOptimizer {
               if (importStatement.isOnDemand()) {
 
                 if (importStatement.isStatic()) {
-                  if (element instanceof PsiMember) {
-                    final PsiMember member = (PsiMember)element;
+                  if (resolved instanceof PsiMember) {
+                    final PsiMember member = (PsiMember)resolved;
                     final PsiClass clazz = member.getContainingClass();
                     if (clazz != null) {
                       final String classQName = clazz.getQualifiedName();
@@ -122,7 +134,7 @@ public class GroovyImportOptimizer implements ImportOptimizer {
                   }
                 }
                 else {
-                  importedName = getTargetQualifiedName(element);
+                  importedName = getTargetQualifiedName(resolved);
                 }
               }
               else {
@@ -152,14 +164,14 @@ public class GroovyImportOptimizer implements ImportOptimizer {
                 if (importedClasses != null) {
                   importedClasses.add(importedName);
                 }
-                if (element instanceof PsiClass && ((PsiClass)element).getContainingClass() != null && innerClasses != null) {
+                if (resolved instanceof PsiClass && ((PsiClass)resolved).getContainingClass() != null && innerClasses != null) {
                   innerClasses.add(importedName);
                 }
               }
             }
           }
           else if (context == null && !(refElement.getParent() instanceof GrImportStatement) && refElement.getQualifier() == null) {
-            addImplicitClass(element);
+            addImplicitClass(resolved);
           }
         }
       }
@@ -179,8 +191,8 @@ public class GroovyImportOptimizer implements ImportOptimizer {
       /**
        * checks if import for implicitly imported class is needed
        */
-      private boolean isImportUsed(GrReferenceElement refElement, PsiElement element) {
-        if (isImplicitlyImported(element, refElement.getReferenceName(), (GroovyFile)file)) {
+      private boolean isImportUsed(GrReferenceElement refElement, PsiElement resolved) {
+        if (isImplicitlyImported(resolved, refElement.getReferenceName(), (GroovyFile)file)) {
           final ClassResolverProcessor processor =
             new ClassResolverProcessor(refElement.getReferenceName(), refElement, ResolverProcessor.RESOLVE_KINDS_CLASS);
           processImports(ResolveState.initial(), null, refElement, processor, ((GroovyFile)file).getImportStatements(), true);
@@ -192,6 +204,46 @@ public class GroovyImportOptimizer implements ImportOptimizer {
       }
     });
 
+    final Set<GrImportStatement> importsToCheck = ContainerUtil.newLinkedHashSet(PsiUtil.getValidImportStatements((GroovyFile)file));
+    for (GrImportStatement anImport : importsToCheck) {
+      if (usedImports != null && usedImports.contains(anImport)) continue;
+
+      final GrCodeReferenceElement ref = anImport.getImportReference();
+      assert ref != null : "invalid import!";
+
+      if (ref.resolve() == null) {
+        if (anImport.isOnDemand()) {
+          if (usedImports != null) {
+            usedImports.add(anImport);
+          }
+          if (unresolvedOnDemandImports != null) {
+            unresolvedOnDemandImports.add(anImport);
+          }
+        }
+        else {
+          String importedName = anImport.getImportedName();
+          if (importedName != null && unresolvedReferenceNames.contains(importedName)) {
+            if (usedImports != null) {
+              usedImports.add(anImport);
+            }
+
+            final String className = getImportReferenceText(anImport);
+
+            if (anImport.isAliasedImport()) {
+              if (aliased != null) {
+                aliased.put(className, importedName);
+              }
+            }
+            else {
+              if (importedClasses != null) {
+                importedClasses.add(className);
+              }
+            }
+          }
+        }
+      }
+    }
+
     if (annotations != null) {
       ((GroovyFile)file).acceptChildren(new GroovyElementVisitor() {
         @Override
@@ -238,12 +290,13 @@ public class GroovyImportOptimizer implements ImportOptimizer {
       final Set<String> simplyImportedClasses = new LinkedHashSet<String>();
       final Set<String> staticallyImportedMembers = new LinkedHashSet<String>();
       final Set<GrImportStatement> usedImports = new HashSet<GrImportStatement>();
+      final Set<GrImportStatement> unresolvedOnDemandImports = new HashSet<GrImportStatement>();
       final Set<String> implicitlyImportedClasses = new LinkedHashSet<String>();
       final Set<String> innerClasses = new HashSet<String>();
       Map<String, String> aliasImported = ContainerUtil.newHashMap();
       Map<String, String> annotatedImports = ContainerUtil.newHashMap();
 
-      processFile(myFile, simplyImportedClasses, staticallyImportedMembers, usedImports, implicitlyImportedClasses, innerClasses,
+      processFile(myFile, simplyImportedClasses, staticallyImportedMembers, usedImports, unresolvedOnDemandImports ,implicitlyImportedClasses, innerClasses,
                   aliasImported, annotatedImports);
       final List<GrImportStatement> oldImports = PsiUtil.getValidImportStatements(file);
       if (myRemoveUnusedOnly) {
@@ -258,7 +311,7 @@ public class GroovyImportOptimizer implements ImportOptimizer {
       // Add new import statements
       GrImportStatement[] newImports =
         prepare(usedImports, simplyImportedClasses, staticallyImportedMembers, implicitlyImportedClasses, innerClasses, aliasImported,
-                annotatedImports);
+                annotatedImports, unresolvedOnDemandImports);
       if (oldImports.isEmpty() && newImports.length == 0 && aliasImported.isEmpty()) {
         return;
       }
@@ -295,7 +348,8 @@ public class GroovyImportOptimizer implements ImportOptimizer {
                                         Set<String> implicitlyImported,
                                         Set<String> innerClasses,
                                         Map<String, String> aliased,
-                                        final Map<String, String> annotations) {
+                                        final Map<String, String> annotations,
+                                        Set<GrImportStatement> unresolvedOnDemandImports) {
       final Project project = myFile.getProject();
       final GroovyCodeStyleSettings settings =
         CodeStyleSettingsManager.getSettings(project).getCustomSettings(GroovyCodeStyleSettings.class);
@@ -432,6 +486,10 @@ public class GroovyImportOptimizer implements ImportOptimizer {
         first.getAnnotationList().replace(factory.createModifierList(allSkippedAnnotations));
       }
 
+      for (GrImportStatement anImport : unresolvedOnDemandImports) {
+        explicated.add(anImport);
+      }
+
       return explicated.toArray(new GrImportStatement[explicated.size()]);
     }
   }
@@ -463,7 +521,7 @@ public class GroovyImportOptimizer implements ImportOptimizer {
   private static String getImportReferenceText(GrImportStatement statement) {
     GrCodeReferenceElement importReference = statement.getImportReference();
     if (importReference != null) {
-      return statement.getText().substring(importReference.getStartOffsetInParent());
+      return importReference.getClassNameText();
     }
     return null;
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy
index 6d2105a15cab..9baff80feaf9 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,8 +125,6 @@ public class OptimizeImportsTest extends LightGroovyTestCase {
     doTest();
   }
 
-  public void testJavaUtilString() { doTest(); }
-
   public void testSamePackage() {
     myFixture.addClass("package foo; public class Bar {}");
     myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject(getTestName(false) + ".groovy", "foo/Foo.groovy"));
@@ -146,6 +144,12 @@ public class OptimizeImportsTest extends LightGroovyTestCase {
   public void testRemoveImplicitlyImported() { doTest(); }
   public void testRemoveImplicitlyDemandImported() { doTest(); }
   public void testDontRemoveRedImports() { doTest(); }
+  public void testDontRemoveRedImports2() { doTest(); }
+  public void testDontRemoveRedImports3() { doTest(); }
+  public void testDontRemoveRedImports4() { doTest(); }
+  public void testDontRemoveRedImports5() { doTest(); }
+  public void testDontRemoveRedImports6() { doTest(); }
+  public void testDontRemoveRedImports7() { doTest(); }
 
   public void testRemoveSamePackaged() {
     myFixture.addClass("package foo.bar; public class Aaaa {}");
@@ -157,9 +161,9 @@ public class OptimizeImportsTest extends LightGroovyTestCase {
   }
 
   public void testJustWrongImport() throws Exception {
-    myFixture.configureByText("a.groovy", "import a.b.c.d");
+    myFixture.configureByText("a.groovy", "import a.b.c.d; final d c;");
     doOptimizeImports();
-    myFixture.checkResult("import a.b.c.d");
+    myFixture.checkResult("import a.b.c.d; final d c;");
   }
 
   public void testCleanBeforeJavadoc() throws Exception {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
index fb640f7b59c5..e1a39a1b68b1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,11 +77,13 @@ def foo(newName) {
     myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, """
 import foo.bar.Zoo
 SomeClass c = new SomeClass()
+Zoo zoo
 """)
     myFixture.renameElement(someClass, "NewClass")
     myFixture.checkResult """
 import foo.bar.Zoo
 NewClass c = new NewClass()
+Zoo zoo
 """
   }
 
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports.groovy
index 71eb1fe51a80..cdbbb609e669 100644
--- a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports.groovy
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports.groovy
@@ -4,4 +4,5 @@ import java.lang.ClassLoader
 
 class ScriptRunnerProxyy {
   private static ClassLoader scriptLoader
+  Abc f;
 }
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2.groovy
new file mode 100644
index 000000000000..62b8e2a44e97
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2.groovy
@@ -0,0 +1,8 @@
+import java.zzz
+import java.yyy.*
+import java.lang.ClassLoader
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private zzz f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2_after.groovy
new file mode 100644
index 000000000000..1194d38648a2
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports2_after.groovy
@@ -0,0 +1,7 @@
+import java.yyy.*
+import java.zzz
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private zzz f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3.groovy
new file mode 100644
index 000000000000..6d9ff606fa04
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3.groovy
@@ -0,0 +1,8 @@
+import java.zzzz
+import java.yyy.*
+import java.lang.ClassLoader
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private zzz f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3_after.groovy
new file mode 100644
index 000000000000..38f1f991a5b6
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports3_after.groovy
@@ -0,0 +1,6 @@
+import java.yyy.*
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private zzz f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4.groovy
new file mode 100644
index 000000000000..f6913f49d53f
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4.groovy
@@ -0,0 +1,8 @@
+import java.zzz as Abc
+import java.yyy.*
+import java.lang.ClassLoader
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private Abc f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4_after.groovy
new file mode 100644
index 000000000000..b36474f8df56
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports4_after.groovy
@@ -0,0 +1,7 @@
+import java.yyy.*
+import java.zzz as Abc
+
+class ScriptRunnerProxyy {
+  private static ClassLoader scriptLoader
+  private Abc f;
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5.groovy
new file mode 100644
index 000000000000..dcb9c907b01c
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5.groovy
@@ -0,0 +1,6 @@
+import java.x.Cde as Abc
+import java.x.Cde
+
+class ScriptRunnerProxyy {
+  private static Cde x
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5_after.groovy
new file mode 100644
index 000000000000..293f042760a2
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports5_after.groovy
@@ -0,0 +1,5 @@
+import java.x.Cde
+
+class ScriptRunnerProxyy {
+  private static Cde x
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6.groovy
new file mode 100644
index 000000000000..416cbc13150a
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6.groovy
@@ -0,0 +1,6 @@
+import java.x.Cde as Abc
+import java.x.Cde
+
+class ScriptRunnerProxyy {
+  private static Abc x
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6_after.groovy
new file mode 100644
index 000000000000..5c94d508891a
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports6_after.groovy
@@ -0,0 +1,5 @@
+import java.x.Cde as Abc
+
+class ScriptRunnerProxyy {
+  private static Abc x
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7.groovy
new file mode 100644
index 000000000000..6cbf4a2da2c5
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7.groovy
@@ -0,0 +1,7 @@
+import java.x.Cde as Abc
+import java.x.Cde
+
+class ScriptRunnerProxyy {
+  private static Cde x
+  private static Abc y
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7_after.groovy
new file mode 100644
index 000000000000..6cbf4a2da2c5
--- /dev/null
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports7_after.groovy
@@ -0,0 +1,7 @@
+import java.x.Cde as Abc
+import java.x.Cde
+
+class ScriptRunnerProxyy {
+  private static Cde x
+  private static Abc y
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports_after.groovy b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports_after.groovy
index 352121354b7a..2fcf294e8a87 100644
--- a/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports_after.groovy
+++ b/plugins/groovy/testdata/optimizeImports/DontRemoveRedImports_after.groovy
@@ -1,6 +1,6 @@
-import java.zzz
 import java.yyy.*
 
 class ScriptRunnerProxyy {
   private static ClassLoader scriptLoader
+  Abc f;
 }
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/JavaUtilString.groovy b/plugins/groovy/testdata/optimizeImports/JavaUtilString.groovy
deleted file mode 100644
index 82a136d2c318..000000000000
--- a/plugins/groovy/testdata/optimizeImports/JavaUtilString.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.util.String
-
-class GrEnum {
-
-  {
-    new AntBuilder().delete(dir: workdir.absolutePath)
-  }
-
-}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/optimizeImports/JavaUtilString_after.groovy b/plugins/groovy/testdata/optimizeImports/JavaUtilString_after.groovy
deleted file mode 100644
index 82a136d2c318..000000000000
--- a/plugins/groovy/testdata/optimizeImports/JavaUtilString_after.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.util.String
-
-class GrEnum {
-
-  {
-    new AntBuilder().delete(dir: workdir.absolutePath)
-  }
-
-}
\ No newline at end of file