9 files changed, 3 insertions, 12 deletions

diff --git a/color.py b/color.py
index 5c612acc..9b3365be 100644
--- a/color.py
+++ b/color.py
@@ -17,7 +17,6 @@ import os
 import sys
 
 import pager
-from git_config import GitConfig
 
 COLORS = {None     :-1,
           'normal' :-1,
diff --git a/git_refs.py b/git_refs.py
index 0e3cc820..11241438 100644
--- a/git_refs.py
+++ b/git_refs.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import os
-import sys
 from trace import Trace
 
 HEAD    = 'HEAD'
diff --git a/main.py b/main.py
index ea29851e..12752299 100755
--- a/main.py
+++ b/main.py
@@ -35,7 +35,6 @@ from git_command import git, GitCommand
 from git_config import init_ssh, close_ssh
 from command import InteractiveCommand
 from command import MirrorSafeCommand
-from command import PagedCommand
 from subcmds.version import Version
 from editor import Editor
 from error import DownloadError
diff --git a/manifest_xml.py b/manifest_xml.py
index 26cc14f6..205e4af7 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -20,7 +20,7 @@ import sys
 import urlparse
 import xml.dom.minidom
 
-from git_config import GitConfig, IsId
+from git_config import GitConfig
 from project import RemoteSpec, Project, MetaProject, R_HEADS, HEAD
 from error import ManifestParseError
 
diff --git a/project.py b/project.py
index 00ebb17f..06baccb5 100644
--- a/project.py
+++ b/project.py
@@ -27,10 +27,8 @@ import time
 from color import Coloring
 from git_command import GitCommand
 from git_config import GitConfig, IsId, GetSchemeFromUrl, ID_RE
-from error import DownloadError
-from error import GitError, HookError, ImportError, UploadError
+from error import GitError, HookError, UploadError
 from error import ManifestInvalidRevisionError
-from progress import Progress
 from trace import IsTrace, Trace
 
 from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index 8da3a750..7890af4d 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys, re, string, random, os
+import sys, re
 from command import Command
 from git_command import GitCommand
 
diff --git a/subcmds/download.py b/subcmds/download.py
index 0ea45c3f..0abe90d0 100644
--- a/subcmds/download.py
+++ b/subcmds/download.py
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import re
 import sys
 
diff --git a/subcmds/grep.py b/subcmds/grep.py
index 1cb5650b..0dc8f9f6 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 import sys
-from optparse import SUPPRESS_HELP
 from color import Coloring
 from command import PagedCommand
 from git_command import git_require, GitCommand
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
index 20662b11..2c1752d7 100644
--- a/subcmds/rebase.py
+++ b/subcmds/rebase.py
@@ -17,8 +17,6 @@ import sys
 
 from command import Command
 from git_command import GitCommand
-from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
-from error import GitError
 
 class Rebase(Command):
   common = True