diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd
index df577f1d33aa26ef7015d39de9ae352b5bb5e46e..b7198d09f5f8a4557edb1fbea4f1d5d81b3b5959 100755
--- a/daemons/ganeti-confd
+++ b/daemons/ganeti-confd
@@ -48,7 +48,6 @@ from ganeti.confd import server as confd_server
 from ganeti import constants
 from ganeti import errors
 from ganeti import daemon
-from ganeti import ssconf
 
 
 class ConfdAsyncUDPServer(daemon.AsyncUDPSocket):
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 7a17e4f9ebb92fcf3bd61fd07506742a510b6913..fce0d2904cc5d7f3383cab1ae1d4930278815071 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -31,7 +31,6 @@
 
 import os
 import sys
-import SocketServer
 import logging
 import signal
 
@@ -47,7 +46,7 @@ from ganeti import http
 from ganeti import utils
 from ganeti import storage
 
-import ganeti.http.server
+import ganeti.http.server # pylint: disable-msg=W0611
 
 
 queue_lock = None
diff --git a/daemons/ganeti-rapi b/daemons/ganeti-rapi
index adbff4c64ca0e881275251586410977e5b7694f8..8ef936502c643c70a173774c53d57165bb243ff9 100755
--- a/daemons/ganeti-rapi
+++ b/daemons/ganeti-rapi
@@ -26,25 +26,21 @@
 
 # C0103: Invalid name ganeti-watcher
 
-import glob
 import logging
 import optparse
 import sys
 import os
 import os.path
-import signal
 
 from ganeti import constants
-from ganeti import errors
 from ganeti import http
 from ganeti import daemon
 from ganeti import ssconf
-from ganeti import utils
 from ganeti import luxi
 from ganeti import serializer
 from ganeti.rapi import connector
 
-import ganeti.http.auth
+import ganeti.http.auth   # pylint: disable-msg=W0611
 import ganeti.http.server
 
 
diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 6c97d40b752a2dd9b6cc183e9c769b20ecf4f513..6346f07c25782dd94e9c23d9880be85aadf72de1 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -35,7 +35,6 @@ import os
 import sys
 import time
 import logging
-import errno
 from optparse import OptionParser
 
 from ganeti import utils
diff --git a/lib/confd/client.py b/lib/confd/client.py
index e2d1a8bd1b416bb6d2fc4f2b64dd6af414995b8e..e3288683f03d7ea071c35e2c462fb6bd7dd19cab 100644
--- a/lib/confd/client.py
+++ b/lib/confd/client.py
@@ -50,7 +50,6 @@ confirming what you already got.
 # E0203: Access to member %r before its definition, since we use
 # objects.py which doesn't explicitely initialise its members
 
-import socket
 import time
 import random
 
diff --git a/lib/http/server.py b/lib/http/server.py
index ba5cc979651b5559953b601e13997289fa401373..c49cb4b2e9a9153a9de8ffa94295677fc4183614 100644
--- a/lib/http/server.py
+++ b/lib/http/server.py
@@ -26,7 +26,6 @@ import BaseHTTPServer
 import cgi
 import logging
 import os
-import select
 import socket
 import time
 import signal
diff --git a/lib/hypervisor/hv_chroot.py b/lib/hypervisor/hv_chroot.py
index 1a9e4a31bde22a9d98461f86cbde8f283408f524..954c92223a6802694a961e9cfb31ec377cc30eea 100644
--- a/lib/hypervisor/hv_chroot.py
+++ b/lib/hypervisor/hv_chroot.py
@@ -27,10 +27,9 @@ import os
 import os.path
 import time
 import logging
-from cStringIO import StringIO
 
 from ganeti import constants
-from ganeti import errors
+from ganeti import errors # pylint: disable-msg=W0611
 from ganeti import utils
 from ganeti.hypervisor import hv_base
 from ganeti.errors import HypervisorError
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 99bffd79fd5dea0dfb0c0288be574eb77d759348..2eb2cc5adea8d6c7c1e0e1959f39ecefb9616f1a 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -23,8 +23,6 @@
 
 """
 
-import os
-import os.path
 import logging
 from cStringIO import StringIO
 
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index 6593aa5675185e88383f99eba33621231efcffad..fd04a92959156a63ec0eb1b2ea2dc8ae4aada14e 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -31,8 +31,6 @@ import sys
 from ganeti.cli import *
 from ganeti import opcodes
 from ganeti import constants
-from ganeti import errors
-from ganeti import utils
 
 
 _VALUE_TRUE = "true"
diff --git a/scripts/gnt-debug b/scripts/gnt-debug
index 475ccb7dc82c2a2a7a258f9053b1d311f77497e3..6c9d5b70844997780cd12364f9bead5aa192190d 100755
--- a/scripts/gnt-debug
+++ b/scripts/gnt-debug
@@ -32,7 +32,6 @@ import time
 from ganeti.cli import *
 from ganeti import cli
 from ganeti import opcodes
-from ganeti import constants
 from ganeti import utils
 from ganeti import errors
 
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index ec08c0d0487bff78390b7eea10acac95f30d9785..56eb510314bcb4c19c09afabdcfaaf9b2ae226de 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -29,7 +29,6 @@ import sys
 import os
 import itertools
 import simplejson
-import time
 from cStringIO import StringIO
 
 from ganeti.cli import *
diff --git a/scripts/gnt-node b/scripts/gnt-node
index f2a13ff85c9980d83e50e76881a1c07353156e57..f1cde4fca38bd0e624f73e2896d8e609d149f6bc 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -29,7 +29,6 @@
 import sys
 
 from ganeti.cli import *
-from ganeti import cli
 from ganeti import opcodes
 from ganeti import utils
 from ganeti import constants
diff --git a/scripts/gnt-os b/scripts/gnt-os
index 53304e2da8cf1073756f00ed5664b47306e09c4d..dd916ac3d1097435618ef9ab184f11cde525aca5 100755
--- a/scripts/gnt-os
+++ b/scripts/gnt-os
@@ -31,7 +31,6 @@ import sys
 from ganeti.cli import *
 from ganeti import opcodes
 from ganeti import utils
-from ganeti import constants
 
 
 def ListOS(opts, args):
diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 575550541222620377ce841deb7e5b81897824b2..e7be5911ebc8f0df3fcadf15fc8cde437485c785 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -32,7 +32,6 @@ import os.path
 import sys
 import optparse
 import logging
-import errno
 
 from ganeti import constants
 from ganeti import serializer