diff --git a/git_superproject.py b/git_superproject.py
index 7a4ca16..b5c262b 100644
--- a/git_superproject.py
+++ b/git_superproject.py
@@ -31,7 +31,7 @@
 
 from git_command import git_require, GitCommand
 from git_config import RepoConfig
-from git_refs import R_HEADS, GitRefs
+from git_refs import GitRefs
 
 _SUPERPROJECT_GIT_NAME = 'superproject.git'
 _SUPERPROJECT_MANIFEST_NAME = 'superproject_override.xml'
diff --git a/gitc_utils.py b/gitc_utils.py
index 486bbeb..dfcfd2a 100644
--- a/gitc_utils.py
+++ b/gitc_utils.py
@@ -14,7 +14,6 @@
 
 import os
 import multiprocessing
-import platform
 import re
 import sys
 import time
diff --git a/manifest_xml.py b/manifest_xml.py
index 129eb3f..5b83f36 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -22,7 +22,7 @@
 import urllib.parse
 
 import gitc_utils
-from git_config import GitConfig, IsId
+from git_config import GitConfig
 from git_refs import R_HEADS, HEAD
 from git_superproject import Superproject
 import platform_utils
diff --git a/run_tests b/run_tests
index 573dd44..5de51cf 100755
--- a/run_tests
+++ b/run_tests
@@ -15,7 +15,6 @@
 
 """Wrapper to run pytest with the right settings."""
 
-import errno
 import os
 import shutil
 import subprocess
diff --git a/subcmds/init.py b/subcmds/init.py
index 0c979cd..d732374 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -13,16 +13,10 @@
 # limitations under the License.
 
 import os
-import platform
-import re
 import sys
-import urllib.parse
 
 from color import Coloring
 from command import InteractiveCommand, MirrorSafeCommand
-from error import ManifestParseError
-from project import SyncBuffer
-from git_config import GitConfig
 from git_command import git_require, MIN_GIT_VERSION_SOFT, MIN_GIT_VERSION_HARD
 from wrapper import Wrapper
 
diff --git a/subcmds/manifest.py b/subcmds/manifest.py
index 08905cb..f4602a5 100644
--- a/subcmds/manifest.py
+++ b/subcmds/manifest.py
@@ -15,7 +15,6 @@
 import json
 import os
 import sys
-import optparse
 
 from command import PagedCommand
 
diff --git a/subcmds/sync.py b/subcmds/sync.py
index e4e7a97..8db429b 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -55,7 +55,7 @@
 from project import Project
 from project import RemoteSpec
 from command import Command, DEFAULT_LOCAL_JOBS, MirrorSafeCommand, WORKER_BATCH_SIZE
-from error import RepoChangedException, GitError, ManifestParseError
+from error import RepoChangedException, GitError
 import platform_utils
 from project import SyncBuffer
 from progress import Progress
diff --git a/tests/test_git_superproject.py b/tests/test_git_superproject.py
index 49295d8..0bdf1a4 100644
--- a/tests/test_git_superproject.py
+++ b/tests/test_git_superproject.py
@@ -21,7 +21,6 @@
 import unittest
 from unittest import mock
 
-from git_command import GitCommand
 import git_superproject
 import git_trace2_event_log
 import manifest_xml