diff --git a/hgext/color.py b/hgext/color.py
index f7557345b19906405c94b499de1a8c189c674dc8_aGdleHQvY29sb3IucHk=..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_aGdleHQvY29sb3IucHk= 100644
--- a/hgext/color.py
+++ b/hgext/color.py
@@ -77,7 +77,7 @@
 
 '''
 
-import os, sys
+import os
 
 from mercurial import commands, dispatch, extensions, ui as uimod
 from mercurial.i18n import _
diff --git a/hgext/eol.py b/hgext/eol.py
index f7557345b19906405c94b499de1a8c189c674dc8_aGdleHQvZW9sLnB5..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_aGdleHQvZW9sLnB5 100644
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -66,7 +66,7 @@
 """
 
 from mercurial.i18n import _
-from mercurial import util, config, extensions, commands, match, cmdutil
+from mercurial import util, config, extensions, match
 import re, os
 
 # Matches a lone LF, i.e., one that is not part of CRLF.
diff --git a/hgext/rebase.py b/hgext/rebase.py
index f7557345b19906405c94b499de1a8c189c674dc8_aGdleHQvcmViYXNlLnB5..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_aGdleHQvcmViYXNlLnB5 100644
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -14,7 +14,7 @@
 http://mercurial.selenic.com/wiki/RebaseExtension
 '''
 
-from mercurial import hg, util, repair, merge, cmdutil, commands, error
+from mercurial import hg, util, repair, merge, cmdutil, commands
 from mercurial import extensions, ancestor, copies, patch
 from mercurial.commands import templateopts
 from mercurial.node import nullrev
diff --git a/hgext/relink.py b/hgext/relink.py
index f7557345b19906405c94b499de1a8c189c674dc8_aGdleHQvcmVsaW5rLnB5..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_aGdleHQvcmVsaW5rLnB5 100644
--- a/hgext/relink.py
+++ b/hgext/relink.py
@@ -7,7 +7,7 @@
 
 """recreates hardlinks between repository clones"""
 
-from mercurial import cmdutil, hg, util
+from mercurial import hg, util
 from mercurial.i18n import _
 import os, stat
 
diff --git a/mercurial/encoding.py b/mercurial/encoding.py
index f7557345b19906405c94b499de1a8c189c674dc8_bWVyY3VyaWFsL2VuY29kaW5nLnB5..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_bWVyY3VyaWFsL2VuY29kaW5nLnB5 100644
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -6,7 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 import error
-import sys, unicodedata, locale, os
+import unicodedata, locale, os
 
 def _getpreferredencoding():
     '''
diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py
index f7557345b19906405c94b499de1a8c189c674dc8_bWVyY3VyaWFsL2hnd2ViL2hnd2ViX21vZC5weQ==..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_bWVyY3VyaWFsL2hnd2ViL2hnd2ViX21vZC5weQ== 100644
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -6,8 +6,8 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-import os, sys, urllib
-from mercurial import ui, hg, hook, error, encoding, templater, util
+import os
+from mercurial import ui, hg, hook, error, encoding, templater
 from common import get_mtime, ErrorResponse, permhooks
 from common import HTTP_OK, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, HTTP_SERVER_ERROR
 from request import wsgirequest
diff --git a/mercurial/httprepo.py b/mercurial/httprepo.py
index f7557345b19906405c94b499de1a8c189c674dc8_bWVyY3VyaWFsL2h0dHByZXBvLnB5..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_bWVyY3VyaWFsL2h0dHByZXBvLnB5 100644
--- a/mercurial/httprepo.py
+++ b/mercurial/httprepo.py
@@ -6,5 +6,5 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from node import bin, hex, nullid
+from node import nullid
 from i18n import _
@@ -10,4 +10,4 @@
 from i18n import _
-import repo, changegroup, statichttprepo, error, url, util, wireproto
+import changegroup, statichttprepo, error, url, util, wireproto
 import os, urllib, urllib2, urlparse, zlib, httplib
 import errno, socket
@@ -12,6 +12,5 @@
 import os, urllib, urllib2, urlparse, zlib, httplib
 import errno, socket
-import encoding
 
 def zgenerator(f):
     zd = zlib.decompressobj()
diff --git a/mercurial/sshrepo.py b/mercurial/sshrepo.py
index f7557345b19906405c94b499de1a8c189c674dc8_bWVyY3VyaWFsL3NzaHJlcG8ucHk=..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_bWVyY3VyaWFsL3NzaHJlcG8ucHk= 100644
--- a/mercurial/sshrepo.py
+++ b/mercurial/sshrepo.py
@@ -6,7 +6,7 @@
 # GNU General Public License version 2 or any later version.
 
 from i18n import _
-import repo, util, error, wireproto
+import util, error, wireproto
 import re
 
 class remotelock(object):
diff --git a/mercurial/sshserver.py b/mercurial/sshserver.py
index f7557345b19906405c94b499de1a8c189c674dc8_bWVyY3VyaWFsL3NzaHNlcnZlci5weQ==..c327bfa5e8315c6d1436599ea235e1e3a3293e7c_bWVyY3VyaWFsL3NzaHNlcnZlci5weQ== 100644
--- a/mercurial/sshserver.py
+++ b/mercurial/sshserver.py
@@ -6,7 +6,6 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from i18n import _
 import util, hook, wireproto
 import os, sys