diff --git a/pisi-cli b/pisi-cli
index 44bc8f57..4a3726e5 100755
--- a/pisi-cli
+++ b/pisi-cli
@@ -16,7 +16,7 @@ import traceback
 import exceptions
 import signal
 
-import pisi.ui
+import pisi
 import pisi.context as ctx
 import pisi.cli.pisicli as pisicli
 
diff --git a/pisi/__init__.py b/pisi/__init__.py
index 0317f5ee..520fa4e5 100644
--- a/pisi/__init__.py
+++ b/pisi/__init__.py
@@ -16,6 +16,7 @@ import os
 import sys
 import atexit
 import logging
+import logging.handlers
 
 __version__ = "2.3_beta1"
 
diff --git a/pisi/api.py b/pisi/api.py
index 52f67887..366fa789 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -12,8 +12,6 @@
 import os
 import fcntl
 import re
-import logging
-import logging.handlers
 import fetcher
 
 import gettext
@@ -24,7 +22,6 @@ import pisi
 import pisi.context as ctx
 import pisi.uri
 import pisi.util
-import pisi.dependency as dependency
 import pisi.pgraph as pgraph
 import pisi.db.packagedb
 import pisi.db.repodb
@@ -40,7 +37,6 @@ import pisi.metadata
 import pisi.file
 import pisi.blacklist
 import pisi.atomicoperations
-import pisi.operations.delta
 import pisi.operations.remove
 import pisi.operations.upgrade
 import pisi.operations.install
diff --git a/pisi/archive.py b/pisi/archive.py
index ada7b209..bf539e3d 100644
--- a/pisi/archive.py
+++ b/pisi/archive.py
@@ -66,7 +66,6 @@ class ArchiveBinary(ArchiveBase):
 
         # we can't unpack .bin files. we'll just move them to target
         # directory and leave the dirty job to actions.py ;)
-        import shutil
         target_file = os.path.join(target_dir, os.path.basename(self.file_path))
         shutil.copyfile(self.file_path, target_file)
 
diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py
index d9c918d1..49bffe20 100644
--- a/pisi/atomicoperations.py
+++ b/pisi/atomicoperations.py
@@ -21,14 +21,12 @@ import zipfile
 
 import pisi
 import pisi.context as ctx
-import pisi.conflict
 import pisi.util as util
 import pisi.metadata
 import pisi.files
 import pisi.uri
 import pisi.ui
 import pisi.version
-import pisi.operations.helper
 import pisi.operations.delta
 import pisi.db
 
diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py
index ed123a9c..b41d7977 100644
--- a/pisi/cli/__init__.py
+++ b/pisi/cli/__init__.py
@@ -11,7 +11,6 @@
 #
 
 import sys
-import logging
 import locale
 
 import gettext
diff --git a/pisi/cli/blame.py b/pisi/cli/blame.py
index 41afe5c7..353fb659 100644
--- a/pisi/cli/blame.py
+++ b/pisi/cli/blame.py
@@ -18,7 +18,6 @@ _ = __trans.ugettext
 
 import pisi.cli.command as command
 import pisi.context as ctx
-import pisi.api
 import pisi.db
 
 class Blame(command.Command):
diff --git a/pisi/cli/command.py b/pisi/cli/command.py
index e759d2cd..5065ee16 100644
--- a/pisi/cli/command.py
+++ b/pisi/cli/command.py
@@ -126,7 +126,6 @@ class Command(object):
         # make destdir absolute
         if self.options.destdir:
             d = str(self.options.destdir)
-            import os.path
             if not os.path.exists(d):
                 pisi.cli.printu(_('Destination directory %s does not exist. Creating directory.\n') % d)
                 os.makedirs(d)
diff --git a/pisi/cli/disablerepo.py b/pisi/cli/disablerepo.py
index da859448..6460597d 100644
--- a/pisi/cli/disablerepo.py
+++ b/pisi/cli/disablerepo.py
@@ -10,14 +10,11 @@
 # Please read the COPYING file.
 #
 
-import optparse
-
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
 import pisi.cli.command as command
-import pisi.context as ctx
 import pisi.api
 
 class DisableRepo(command.Command):
diff --git a/pisi/cli/enablerepo.py b/pisi/cli/enablerepo.py
index 5305e917..191ef74a 100644
--- a/pisi/cli/enablerepo.py
+++ b/pisi/cli/enablerepo.py
@@ -10,14 +10,11 @@
 # Please read the COPYING file.
 #
 
-import optparse
-
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
 import pisi.cli.command as command
-import pisi.context as ctx
 import pisi.api
 
 class EnableRepo(command.Command):
diff --git a/pisi/cli/listinstalled.py b/pisi/cli/listinstalled.py
index 0288ee5f..8a71d771 100644
--- a/pisi/cli/listinstalled.py
+++ b/pisi/cli/listinstalled.py
@@ -18,7 +18,6 @@ _ = __trans.ugettext
 
 import pisi.cli.command as command
 import pisi.context as ctx
-import pisi.api
 import pisi.db
 
 class ListInstalled(command.Command):
diff --git a/pisi/cli/listnewest.py b/pisi/cli/listnewest.py
index de9df9ca..5f4b43e3 100644
--- a/pisi/cli/listnewest.py
+++ b/pisi/cli/listnewest.py
@@ -18,7 +18,6 @@ _ = __trans.ugettext
 
 import pisi.cli.command as command
 import pisi.context as ctx
-import pisi.util as util
 import pisi.api
 import pisi.db
 
diff --git a/pisi/cli/listupgrades.py b/pisi/cli/listupgrades.py
index c844955f..533a2109 100644
--- a/pisi/cli/listupgrades.py
+++ b/pisi/cli/listupgrades.py
@@ -10,7 +10,6 @@
 # Please read the COPYING file.
 #
 
-import os
 import optparse
 
 import gettext
diff --git a/pisi/cli/upgrade.py b/pisi/cli/upgrade.py
index 81c279a8..caa9ac7e 100644
--- a/pisi/cli/upgrade.py
+++ b/pisi/cli/upgrade.py
@@ -12,14 +12,12 @@
 
 import optparse
 
-import os
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
 import pisi.cli.command as command
 import pisi.context as ctx
-import pisi.blacklist
 import pisi.api
 import pisi.db
 
diff --git a/pisi/comariface.py b/pisi/comariface.py
index 1840724c..d31e5468 100644
--- a/pisi/comariface.py
+++ b/pisi/comariface.py
@@ -12,7 +12,6 @@
 
 import os
 import time
-import select
 import string
 
 import gettext
diff --git a/pisi/component.py b/pisi/component.py
index b5fb8676..fe1227ef 100644
--- a/pisi/component.py
+++ b/pisi/component.py
@@ -10,12 +10,6 @@
 # Please read the COPYING file.
 #
 
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
-
-import pisi
-import pisi.context as ctx
 import pisi.pxml.xmlfile as xmlfile
 import pisi.pxml.autoxml as autoxml
 
diff --git a/pisi/db/componentdb.py b/pisi/db/componentdb.py
index 337ded66..581892bb 100644
--- a/pisi/db/componentdb.py
+++ b/pisi/db/componentdb.py
@@ -15,8 +15,6 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
-import piksemel
-
 import pisi
 import pisi.db.repodb
 import pisi.db.itembyrepo
diff --git a/pisi/db/filesdb.py b/pisi/db/filesdb.py
index 50cec8e9..b48f7cc2 100644
--- a/pisi/db/filesdb.py
+++ b/pisi/db/filesdb.py
@@ -9,9 +9,6 @@
 #
 # Please read the COPYING file.
 #
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
 
 import os
 import re
diff --git a/pisi/db/historydb.py b/pisi/db/historydb.py
index df4f9556..1bf7e6a7 100644
--- a/pisi/db/historydb.py
+++ b/pisi/db/historydb.py
@@ -11,13 +11,6 @@
 #
 
 import os
-import time
-import datetime
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
-
-import piksemel
 
 import pisi.context as ctx
 import pisi.db.lazydb as lazydb
diff --git a/pisi/db/lazydb.py b/pisi/db/lazydb.py
index 5e5661aa..157a8237 100644
--- a/pisi/db/lazydb.py
+++ b/pisi/db/lazydb.py
@@ -11,7 +11,6 @@
 #
 
 import os
-import stat
 import cPickle
 import time
 import pisi.context as ctx
diff --git a/pisi/db/repodb.py b/pisi/db/repodb.py
index a82a2c57..51729f3d 100644
--- a/pisi/db/repodb.py
+++ b/pisi/db/repodb.py
@@ -21,7 +21,6 @@ import piksemel
 import pisi
 import pisi.uri
 import pisi.util
-import pisi.index
 import pisi.context as ctx
 import pisi.db.lazydb as lazydb
 
diff --git a/pisi/db/sourcedb.py b/pisi/db/sourcedb.py
index 8175a14d..a580fe08 100644
--- a/pisi/db/sourcedb.py
+++ b/pisi/db/sourcedb.py
@@ -12,9 +12,6 @@
 
 import re
 import gzip
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
 
 import piksemel
 
diff --git a/pisi/fetcher.py b/pisi/fetcher.py
index 0402cc8f..2065f7bf 100644
--- a/pisi/fetcher.py
+++ b/pisi/fetcher.py
@@ -17,7 +17,6 @@ knows what."""
 
 # python standard library modules
 import os
-import sys
 import time
 import base64
 import shutil
diff --git a/pisi/graph.py b/pisi/graph.py
index 354f5eea..784b9e4b 100644
--- a/pisi/graph.py
+++ b/pisi/graph.py
@@ -12,7 +12,6 @@
 # the most simple minded digraph class ever
 
 
-import sys
 import string
 
 import pisi
diff --git a/pisi/group.py b/pisi/group.py
index 992b2905..f99a28f9 100644
--- a/pisi/group.py
+++ b/pisi/group.py
@@ -10,10 +10,6 @@
 # Please read the COPYING file.
 #
 
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
-
 import pisi
 import pisi.pxml.xmlfile as xmlfile
 import pisi.pxml.autoxml as autoxml
diff --git a/pisi/metadata.py b/pisi/metadata.py
index 8e5496e7..d37fb4db 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -21,7 +21,6 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
-import pisi.context as ctx
 import pisi.specfile as specfile
 import pisi.pxml.xmlfile as xmlfile
 import pisi.pxml.autoxml as autoxml
diff --git a/pisi/operations/emerge.py b/pisi/operations/emerge.py
index 8e50e90a..71f5bfc1 100644
--- a/pisi/operations/emerge.py
+++ b/pisi/operations/emerge.py
@@ -21,7 +21,6 @@ import pisi.operations
 import pisi.context as ctx
 import pisi.util as util
 import pisi.atomicoperations as atomicoperations
-import pisi.dependency as dependency
 import pisi.ui as ui
 import pisi.db
 
diff --git a/pisi/operations/install.py b/pisi/operations/install.py
index 93270c65..1cdc6500 100644
--- a/pisi/operations/install.py
+++ b/pisi/operations/install.py
@@ -24,7 +24,6 @@ import pisi.util as util
 import pisi.atomicoperations as atomicoperations
 import pisi.operations as operations
 import pisi.pgraph as pgraph
-import pisi.dependency as dependency
 import pisi.ui as ui
 import pisi.db
 
diff --git a/pisi/operations/remove.py b/pisi/operations/remove.py
index 8d852111..0307cd81 100644
--- a/pisi/operations/remove.py
+++ b/pisi/operations/remove.py
@@ -19,7 +19,6 @@ _ = __trans.ugettext
 import pisi
 import pisi.context as ctx
 import pisi.atomicoperations as atomicoperations
-import pisi.dependency as dependency
 import pisi.pgraph as pgraph
 import pisi.util as util
 import pisi.ui as ui
diff --git a/pisi/operations/upgrade.py b/pisi/operations/upgrade.py
index 87343e3f..7e4bd530 100644
--- a/pisi/operations/upgrade.py
+++ b/pisi/operations/upgrade.py
@@ -23,7 +23,6 @@ import pisi.pgraph as pgraph
 import pisi.atomicoperations as atomicoperations
 import pisi.operations as operations
 import pisi.util as util
-import pisi.dependency as dependency
 import pisi.db
 import pisi.blacklist
 
diff --git a/pisi/pgraph.py b/pisi/pgraph.py
index 564ec7ec..28db5f86 100644
--- a/pisi/pgraph.py
+++ b/pisi/pgraph.py
@@ -12,11 +12,6 @@
 
 """PiSi package relation graph that represents the state of packagedb"""
 
-import string
-
-import pisi
-import pisi.db
-import pisi.context as ctx
 import graph
 
 # Cache the results from packagedb queries in a graph
diff --git a/pisi/pxml/__init__.py b/pisi/pxml/__init__.py
index cde29f87..9930e4dc 100644
--- a/pisi/pxml/__init__.py
+++ b/pisi/pxml/__init__.py
@@ -10,13 +10,6 @@
 # Please read the COPYING file.
 #
 
-import sys
-import locale
-
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
-
 import pisi
 
 class Error(pisi.Error):
diff --git a/pisi/pxml/autoxml.py b/pisi/pxml/autoxml.py
index 615d6665..ada57a1d 100644
--- a/pisi/pxml/autoxml.py
+++ b/pisi/pxml/autoxml.py
@@ -21,7 +21,6 @@
 
 # System
 import locale
-import codecs
 import types
 import formatter
 import sys
diff --git a/pisi/pxml/xmlfile.py b/pisi/pxml/xmlfile.py
index b5f565be..8cc25c66 100644
--- a/pisi/pxml/xmlfile.py
+++ b/pisi/pxml/xmlfile.py
@@ -25,9 +25,6 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
-import codecs
-import exceptions
-
 import piksemel as iks
 
 import pisi
diff --git a/pisi/relation.py b/pisi/relation.py
index 134733f0..62c920ac 100644
--- a/pisi/relation.py
+++ b/pisi/relation.py
@@ -10,10 +10,6 @@
 # Please read the COPYING file.
 #
 
-import gettext
-__trans = gettext.translation('pisi', fallback=True)
-_ = __trans.ugettext
-
 import pisi
 import pisi.version
 import pisi.db
diff --git a/pisi/scenarioapi/constants.py b/pisi/scenarioapi/constants.py
index 7ab2aa82..84f395ac 100644
--- a/pisi/scenarioapi/constants.py
+++ b/pisi/scenarioapi/constants.py
@@ -9,9 +9,6 @@
 #
 # Please read the COPYING file.
 
-import locale
-from os.path import join
-
 class _constant:
     "Constant members implementation"
     class ConstError(TypeError):
diff --git a/pisi/uri.py b/pisi/uri.py
index 1614410d..df1e583e 100644
--- a/pisi/uri.py
+++ b/pisi/uri.py
@@ -20,8 +20,6 @@ import gettext
 __trans = gettext.translation('pisi', fallback=True)
 _ = __trans.ugettext
 
-import pisi.util as util
-
 class URI(object):
     """URI class provides a URL parser and simplifies working with
     URLs."""