diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index c77ed8efc2d9..d4257936a1f4 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -163,6 +163,8 @@
 
     <renamePsiElementProcessor implementation="com.jetbrains.python.refactoring.RenamePyFunctionProcessor" order="last" />
 
+    <lang.importOptimizer language="Python" implementationClass="com.jetbrains.python.codeInsight.PyImportOptimizer"/>
+
     <!-- Django -->
     <codeInsight.lineMarkerProvider language="Python" implementationClass="com.jetbrains.django.annotator.ViewMethodLineMarkerProvider"/>
     <configurationType implementation="com.jetbrains.django.run.DjangoServerRunConfigurationType"/>
diff --git a/python/src/com/jetbrains/python/codeInsight/PyImportOptimizer.java b/python/src/com/jetbrains/python/codeInsight/PyImportOptimizer.java
new file mode 100644
index 000000000000..10ddb456e02b
--- /dev/null
+++ b/python/src/com/jetbrains/python/codeInsight/PyImportOptimizer.java
@@ -0,0 +1,34 @@
+package com.jetbrains.python.codeInsight;
+
+import com.intellij.lang.ImportOptimizer;
+import com.intellij.psi.PsiFile;
+import com.jetbrains.python.inspections.PyUnresolvedReferencesInspection;
+import com.jetbrains.python.psi.PyElement;
+import com.jetbrains.python.psi.PyRecursiveElementVisitor;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author yole
+ */
+public class PyImportOptimizer implements ImportOptimizer {
+  public boolean supports(PsiFile file) {
+    return true;
+  }
+
+  @NotNull
+  public Runnable processFile(PsiFile file) {
+    final PyUnresolvedReferencesInspection.Visitor visitor = new PyUnresolvedReferencesInspection.Visitor(null);
+    file.accept(new PyRecursiveElementVisitor() {
+      @Override
+      public void visitPyElement(PyElement node) {
+        super.visitPyElement(node);
+        node.accept(visitor);
+      }
+    });
+    return new Runnable() {
+      public void run() {
+        visitor.optimizeImports();
+      }
+    };
+  }
+}
diff --git a/python/src/com/jetbrains/python/inspections/PyInspectionVisitor.java b/python/src/com/jetbrains/python/inspections/PyInspectionVisitor.java
index a8f8471826c4..895d3fa8021c 100644
--- a/python/src/com/jetbrains/python/inspections/PyInspectionVisitor.java
+++ b/python/src/com/jetbrains/python/inspections/PyInspectionVisitor.java
@@ -13,13 +13,13 @@ import org.jetbrains.annotations.Nullable;
  * A copy of Ruby's visitor helper.
  */
 public class PyInspectionVisitor extends PyElementVisitor {
-  private final ProblemsHolder myHolder;
+  @Nullable private final ProblemsHolder myHolder;
 
-  public PyInspectionVisitor(final ProblemsHolder holder) {
+  public PyInspectionVisitor(@Nullable final ProblemsHolder holder) {
     myHolder = holder;
   }
 
-  public ProblemsHolder getHolder() {
+  protected ProblemsHolder getHolder() {
     return myHolder;
   }
 
@@ -28,7 +28,9 @@ public class PyInspectionVisitor extends PyElementVisitor {
     if (element == null || element.getTextLength() == 0){
       return;
     }
-    myHolder.registerProblem(element, message);
+    if (myHolder != null) {
+      myHolder.registerProblem(element, message);
+    }
   }
 
   protected final void registerProblem(@Nullable final PsiElement element,
@@ -37,7 +39,9 @@ public class PyInspectionVisitor extends PyElementVisitor {
       if (element == null || element.getTextLength() == 0){
           return;
       }
+    if (myHolder != null) {
       myHolder.registerProblem(element, message, quickFix);
+    }
   }
 
   protected final void registerProblem(final PsiElement element,
@@ -47,7 +51,9 @@ public class PyInspectionVisitor extends PyElementVisitor {
     if (element == null || element.getTextLength() == 0){
         return;
     }
-    myHolder.registerProblem(myHolder.getManager().createProblemDescriptor(element, message, type,  action, myHolder.isOnTheFly()));
+    if (myHolder != null) {
+      myHolder.registerProblem(myHolder.getManager().createProblemDescriptor(element, message, type,  action, myHolder.isOnTheFly()));
+    }
   }
 
   /**
@@ -61,7 +67,9 @@ public class PyInspectionVisitor extends PyElementVisitor {
     final HintAction hintAction,
     final LocalQuickFix... fixes)
   {
-    myHolder.registerProblem(myHolder.getManager().createProblemDescriptor(psiElement, descriptionTemplate, highlightType, hintAction,
-                                                                           myHolder.isOnTheFly(), fixes));
+    if (myHolder != null) {
+      myHolder.registerProblem(myHolder.getManager().createProblemDescriptor(psiElement, descriptionTemplate, highlightType, hintAction,
+                                                                             myHolder.isOnTheFly(), fixes));
+    }
   }
 }
diff --git a/python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java b/python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
index 717924391055..2589472a933e 100644
--- a/python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 /**
- * Marks references that fail to resolve.
+ * Marks references that fail to resolve. Also tracks unused imports and provides "optimize imports" support.
  * User: dcheryasov
  * Date: Nov 15, 2008
  */
@@ -99,7 +99,7 @@ public class PyUnresolvedReferencesInspection extends LocalInspectionTool {
 
   public static class Visitor extends PyInspectionVisitor {
     private Set<NameDefiner> myUsedImports = Collections.synchronizedSet(new HashSet<NameDefiner>());
-    private Set<PyImportElement> myAllImports = Collections.synchronizedSet(new HashSet<PyImportElement>());
+    private Set<NameDefiner> myAllImports = Collections.synchronizedSet(new HashSet<NameDefiner>());
 
     public Visitor(final ProblemsHolder holder) {
       super(holder);
@@ -277,6 +277,12 @@ public class PyUnresolvedReferencesInspection extends LocalInspectionTool {
       myAllImports.add(node);
     }
 
+    @Override
+    public void visitPyStarImportElement(PyStarImportElement node) {
+      super.visitPyStarImportElement(node);
+      myAllImports.add(node);
+    }
+
     @Override
     public void visitPyElement(final PyElement node) {
       super.visitPyElement(node);
@@ -442,32 +448,49 @@ public class PyUnresolvedReferencesInspection extends LocalInspectionTool {
     }
 
     public void highlightUnusedImports() {
-      myAllImports.removeAll(myUsedImports);
-      final NameDefiner[] unusedImports = myAllImports.toArray(new NameDefiner[myAllImports.size()]);
+      final List<PsiElement> unused = collectUnusedImportElements();
+      for (PsiElement element : unused) {
+        registerProblem(element, "Unused import statement", ProblemHighlightType.LIKE_UNUSED_SYMBOL, null);
+      }
+    }
+
+    private List<PsiElement> collectUnusedImportElements() {
+      List<PsiElement> result = new ArrayList<PsiElement>();
+
+      Set<NameDefiner> unusedImports = new HashSet<NameDefiner>(myAllImports);
+      unusedImports.removeAll(myUsedImports);
 
       Set<PyImportStatementBase> unusedStatements = new HashSet<PyImportStatementBase>();
       for (NameDefiner unusedImport : unusedImports) {
         PyImportStatementBase importStatement = PsiTreeUtil.getParentOfType(unusedImport, PyImportStatementBase.class);
         if (importStatement != null && !unusedStatements.contains(importStatement)) {
-          if (areAllImportsUnused(importStatement)) {
+          if (unusedImport instanceof PyStarImportElement || areAllImportsUnused(importStatement, unusedImports)) {
             unusedStatements.add(importStatement);
-            registerProblem(importStatement, "Unused import statement", ProblemHighlightType.LIKE_UNUSED_SYMBOL, null);
+            result.add(importStatement);
           }
           else {
-            registerProblem(unusedImport, "Unused import statement", ProblemHighlightType.LIKE_UNUSED_SYMBOL, null);
+            result.add(unusedImport);
           }
         }
       }
+      return result;
     }
 
-    private boolean areAllImportsUnused(PyImportStatementBase importStatement) {
+    private static boolean areAllImportsUnused(PyImportStatementBase importStatement, Set<NameDefiner> unusedImports) {
       final PyImportElement[] elements = importStatement.getImportElements();
       for (PyImportElement element : elements) {
-        if (!myAllImports.contains(element)) {
+        if (!unusedImports.contains(element)) {
           return false;
         }
       }
       return true;
     }
+
+    public void optimizeImports() {
+      final List<PsiElement> elementsToDelete = collectUnusedImportElements();
+      for (PsiElement element : elementsToDelete) {
+        element.delete();
+      }
+    }
   }
 }
diff --git a/python/src/com/jetbrains/python/psi/PyElementVisitor.java b/python/src/com/jetbrains/python/psi/PyElementVisitor.java
index d51a69d151b0..4e5b39503abc 100644
--- a/python/src/com/jetbrains/python/psi/PyElementVisitor.java
+++ b/python/src/com/jetbrains/python/psi/PyElementVisitor.java
@@ -217,4 +217,8 @@ public class PyElementVisitor extends PsiElementVisitor {
   public void visitPyImportElement(PyImportElement node) {
     visitPyElement(node);
   }
+
+  public void visitPyStarImportElement(PyStarImportElement node) {
+    visitPyElement(node);
+  }
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
index accafa14afa8..caa2d5b52fa2 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
@@ -139,4 +139,10 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl<PyFromImportSta
     }
     return true;
   }
+
+  @Override
+  public void deleteChildInternal(@NotNull ASTNode child) {
+    PyPsiUtils.deleteAdjacentComma(this, child, getImportElements());
+    super.deleteChildInternal(child);
+  }
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyImportStatementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyImportStatementImpl.java
index 8d6b3fa17e32..6379ae950d40 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyImportStatementImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyImportStatementImpl.java
@@ -57,4 +57,10 @@ public class PyImportStatementImpl extends PyBaseElementImpl<PyImportStatementSt
   protected void acceptPyVisitor(PyElementVisitor pyVisitor) {
     pyVisitor.visitPyImportStatement(this);
   }
+
+  @Override
+  public void deleteChildInternal(@NotNull ASTNode child) {
+    PyPsiUtils.deleteAdjacentComma(this, child, getImportElements());
+    super.deleteChildInternal(child);
+  }
 }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyPsiUtils.java b/python/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
index 2cc3d6b0726f..4b827393e7f5 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyPsiUtils.java
@@ -1,5 +1,6 @@
 package com.jetbrains.python.psi.impl;
 
+import com.intellij.extapi.psi.ASTDelegatePsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -12,6 +13,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.ArrayUtil;
 import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.psi.*;
 import org.jetbrains.annotations.NotNull;
@@ -254,4 +256,16 @@ public class PyPsiUtils {
       return element;
     }
   }
+
+  static void deleteAdjacentComma(ASTDelegatePsiElement pyImportStatement, ASTNode child, final PyElement[] elements) {
+    if (ArrayUtil.contains(child.getPsi(), elements)) {
+      ASTNode next = getNextComma(child);
+      if (next == null) {
+        next = getPrevComma(child);
+      }
+      if (next != null) {
+        pyImportStatement.deleteChildInternal(next);
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java
index 92776b9a4537..01997c8d09cf 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java
@@ -79,4 +79,9 @@ public class PyStarImportElementImpl extends PyElementImpl implements PyStarImpo
       }
     };
   }
+
+  @Override
+  protected void acceptPyVisitor(PyElementVisitor pyVisitor) {
+    pyVisitor.visitPyStarImportElement(this);
+  }
 }
diff --git a/python/testData/optimizeImports/importStar.after.py b/python/testData/optimizeImports/importStar.after.py
new file mode 100644
index 000000000000..1e4c71b603a6
--- /dev/null
+++ b/python/testData/optimizeImports/importStar.after.py
@@ -0,0 +1,2 @@
+from re import *
+compile
diff --git a/python/testData/optimizeImports/importStar.py b/python/testData/optimizeImports/importStar.py
new file mode 100644
index 000000000000..444e7edf22e8
--- /dev/null
+++ b/python/testData/optimizeImports/importStar.py
@@ -0,0 +1,3 @@
+from sys import *
+from re import *
+compile
diff --git a/python/testData/optimizeImports/importStarOneOfMultiple.after.py b/python/testData/optimizeImports/importStarOneOfMultiple.after.py
new file mode 100644
index 000000000000..1e6589a19e4c
--- /dev/null
+++ b/python/testData/optimizeImports/importStarOneOfMultiple.after.py
@@ -0,0 +1,2 @@
+from re import compile
+compile
\ No newline at end of file
diff --git a/python/testData/optimizeImports/importStarOneOfMultiple.py b/python/testData/optimizeImports/importStarOneOfMultiple.py
new file mode 100644
index 000000000000..eb769c48e39c
--- /dev/null
+++ b/python/testData/optimizeImports/importStarOneOfMultiple.py
@@ -0,0 +1,2 @@
+from re import compile, search
+compile
\ No newline at end of file
diff --git a/python/testData/optimizeImports/oneOfMultiple.after.py b/python/testData/optimizeImports/oneOfMultiple.after.py
new file mode 100644
index 000000000000..24d13554fc54
--- /dev/null
+++ b/python/testData/optimizeImports/oneOfMultiple.after.py
@@ -0,0 +1,2 @@
+import sys
+print sys.argv
diff --git a/python/testData/optimizeImports/oneOfMultiple.py b/python/testData/optimizeImports/oneOfMultiple.py
new file mode 100644
index 000000000000..c54e9fd4ed16
--- /dev/null
+++ b/python/testData/optimizeImports/oneOfMultiple.py
@@ -0,0 +1,2 @@
+import sys, os
+print sys.argv
diff --git a/python/testData/optimizeImports/simple.after.py b/python/testData/optimizeImports/simple.after.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/optimizeImports/simple.py b/python/testData/optimizeImports/simple.py
new file mode 100644
index 000000000000..922ddb84c85a
--- /dev/null
+++ b/python/testData/optimizeImports/simple.py
@@ -0,0 +1 @@
+import sys
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyOptimizeImportsTest.java b/python/testSrc/com/jetbrains/python/PyOptimizeImportsTest.java
new file mode 100644
index 000000000000..1cf3b334ee49
--- /dev/null
+++ b/python/testSrc/com/jetbrains/python/PyOptimizeImportsTest.java
@@ -0,0 +1,32 @@
+package com.jetbrains.python;
+
+import com.intellij.codeInsight.actions.OptimizeImportsAction;
+import com.intellij.ide.DataManager;
+import com.jetbrains.python.fixtures.PyLightFixtureTestCase;
+
+/**
+ * @author yole
+ */
+public class PyOptimizeImportsTest extends PyLightFixtureTestCase {
+  public void testSimple() throws Exception {
+    doTest();
+  }
+
+  public void testOneOfMultiple() throws Exception {
+    doTest();
+  }
+
+  public void testImportStar() throws Exception {
+    doTest();
+  }
+
+  public void testImportStarOneOfMultiple() throws Exception {
+    doTest();
+  }
+
+  private void doTest() throws Exception {
+    myFixture.configureByFile("optimizeImports/" + getTestName(true) + ".py");
+    OptimizeImportsAction.actionPerformedImpl(DataManager.getInstance().getDataContext(myFixture.getEditor().getContentComponent()));
+    myFixture.checkResultByFile("optimizeImports/" + getTestName(true) + ".after.py");
+  }
+}
diff --git a/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java b/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
index 0926674eed5a..6e26996ce9f7 100644
--- a/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
+++ b/python/testSrc/com/jetbrains/python/PythonAllTestsSuite.java
@@ -53,7 +53,8 @@ public class PythonAllTestsSuite {
     PyFindUsagesTest.class,
     PyTypeTest.class,
     PyControlFlowBuilderTest.class,
-    PyCodeFragmentTest.class
+    PyCodeFragmentTest.class,
+    PyOptimizeImportsTest.class
   };
 
   public static TestSuite suite() {