diff --git a/libraries/entropy/cache.py b/libraries/entropy/cache.py
index 4b06e6312..3b3222d85 100644
--- a/libraries/entropy/cache.py
+++ b/libraries/entropy/cache.py
@@ -16,7 +16,6 @@
 
 """
 
-from __future__ import with_statement
 from entropy.core import Singleton
 from entropy.misc import TimeScheduled, Lifo
 import time
diff --git a/libraries/entropy/client/interfaces/cache.py b/libraries/entropy/client/interfaces/cache.py
index bf475b2e1..fb71d5c65 100644
--- a/libraries/entropy/client/interfaces/cache.py
+++ b/libraries/entropy/client/interfaces/cache.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Cache Interface}.
 
 """
-from __future__ import with_statement
 import os
 from entropy.const import *
 from entropy.exceptions import *
diff --git a/libraries/entropy/client/interfaces/client.py b/libraries/entropy/client/interfaces/client.py
index f3208c742..8ba10e373 100644
--- a/libraries/entropy/client/interfaces/client.py
+++ b/libraries/entropy/client/interfaces/client.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import sys
 from entropy.core import Singleton
diff --git a/libraries/entropy/client/interfaces/dep.py b/libraries/entropy/client/interfaces/dep.py
index 4a22c7bb4..8d3a701af 100644
--- a/libraries/entropy/client/interfaces/dep.py
+++ b/libraries/entropy/client/interfaces/dep.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Dependency handling Interface}.
 
 """
-from __future__ import with_statement
 from entropy.misc import Lifo
 from entropy.const import *
 from entropy.exceptions import *
diff --git a/libraries/entropy/client/interfaces/fetch.py b/libraries/entropy/client/interfaces/fetch.py
index 424a52f72..8fca1771e 100644
--- a/libraries/entropy/client/interfaces/fetch.py
+++ b/libraries/entropy/client/interfaces/fetch.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Packages retrieval Interface}.
 
 """
-from __future__ import with_statement
 import os
 from entropy.i18n import _
 from entropy.const import *
diff --git a/libraries/entropy/client/interfaces/loaders.py b/libraries/entropy/client/interfaces/loaders.py
index 3fc0bb764..ded84aa74 100644
--- a/libraries/entropy/client/interfaces/loaders.py
+++ b/libraries/entropy/client/interfaces/loaders.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Instance Loaders Interface}.
 
 """
-from __future__ import with_statement
 from entropy.spm.plugins.factory import get_default_instance as get_spm, \
     get_default_class as get_spm_default_class
 from entropy.const import *
diff --git a/libraries/entropy/client/interfaces/methods.py b/libraries/entropy/client/interfaces/methods.py
index 9eb9d1dd0..aba2a0774 100644
--- a/libraries/entropy/client/interfaces/methods.py
+++ b/libraries/entropy/client/interfaces/methods.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Miscellaneous functions Interface}.
 
 """
-from __future__ import with_statement
 import os
 import stat
 import fcntl
diff --git a/libraries/entropy/client/interfaces/noticeboard.py b/libraries/entropy/client/interfaces/noticeboard.py
index f2c799ca5..486e0110a 100644
--- a/libraries/entropy/client/interfaces/noticeboard.py
+++ b/libraries/entropy/client/interfaces/noticeboard.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Notice Board functions Interface}.
 
 """
-from __future__ import with_statement
 import os
 from entropy.misc import RSS
 from entropy.dump import loadobj as dump_loadobj, dumpobj as dump_dumpobj
diff --git a/libraries/entropy/client/interfaces/package.py b/libraries/entropy/client/interfaces/package.py
index 2c23b58ee..a94656e1f 100644
--- a/libraries/entropy/client/interfaces/package.py
+++ b/libraries/entropy/client/interfaces/package.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client Package Interface}.
 
 """
-from __future__ import with_statement
 import os
 import errno
 import stat
diff --git a/libraries/entropy/client/interfaces/repository.py b/libraries/entropy/client/interfaces/repository.py
index 529fcdb71..52f25db9f 100644
--- a/libraries/entropy/client/interfaces/repository.py
+++ b/libraries/entropy/client/interfaces/repository.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import time
 import shutil
diff --git a/libraries/entropy/client/interfaces/trigger.py b/libraries/entropy/client/interfaces/trigger.py
index 81c9b4c49..c1dc37eb7 100644
--- a/libraries/entropy/client/interfaces/trigger.py
+++ b/libraries/entropy/client/interfaces/trigger.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import subprocess
 import shutil
 from entropy.client.interfaces.client import Client
diff --git a/libraries/entropy/client/services/system/interfaces.py b/libraries/entropy/client/services/system/interfaces.py
index 27a2619f5..122eb876b 100644
--- a/libraries/entropy/client/services/system/interfaces.py
+++ b/libraries/entropy/client/services/system/interfaces.py
@@ -9,7 +9,6 @@
     B{Entropy Client Services Base Interface}.
 
 """
-from __future__ import with_statement
 import time
 from entropy.exceptions import *
 from entropy.i18n import _
diff --git a/libraries/entropy/client/services/system/methods.py b/libraries/entropy/client/services/system/methods.py
index b9e5dc7fe..204bee302 100644
--- a/libraries/entropy/client/services/system/methods.py
+++ b/libraries/entropy/client/services/system/methods.py
@@ -9,7 +9,6 @@
     B{Entropy Client Services Base Mixin Interfaces}.
 
 """
-from __future__ import with_statement
 from entropy.i18n import _
 
 class BaseMixin:
diff --git a/libraries/entropy/client/services/ugc/commands.py b/libraries/entropy/client/services/ugc/commands.py
index c7979ce94..f27468669 100644
--- a/libraries/entropy/client/services/ugc/commands.py
+++ b/libraries/entropy/client/services/ugc/commands.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 from entropy.exceptions import *
 from entropy.const import etpConst
diff --git a/libraries/entropy/client/services/ugc/interfaces.py b/libraries/entropy/client/services/ugc/interfaces.py
index 053a72f51..765e8d974 100644
--- a/libraries/entropy/client/services/ugc/interfaces.py
+++ b/libraries/entropy/client/services/ugc/interfaces.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 from entropy.core import Singleton
 from entropy.exceptions import *
diff --git a/libraries/entropy/const.py b/libraries/entropy/const.py
index 77dd033f3..538e3a195 100644
--- a/libraries/entropy/const.py
+++ b/libraries/entropy/const.py
@@ -30,7 +30,6 @@
 """
 
 
-from __future__ import with_statement
 
 import sys
 import os
diff --git a/libraries/entropy/core/settings/base.py b/libraries/entropy/core/settings/base.py
index 175dd5fd7..938dff98e 100644
--- a/libraries/entropy/core/settings/base.py
+++ b/libraries/entropy/core/settings/base.py
@@ -17,7 +17,6 @@
     ONLY mimics a I{dict} AND it's not a subclass of it.
 
 """
-from __future__ import with_statement
 import os
 import sys
 from threading import RLock
diff --git a/libraries/entropy/db.py b/libraries/entropy/db.py
index 6f9720350..9e63c466f 100644
--- a/libraries/entropy/db.py
+++ b/libraries/entropy/db.py
@@ -34,7 +34,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 from entropy.const import etpConst, etpCache, const_setup_file
diff --git a/libraries/entropy/dump.py b/libraries/entropy/dump.py
index faba81556..44a2a4048 100644
--- a/libraries/entropy/dump.py
+++ b/libraries/entropy/dump.py
@@ -23,7 +23,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 from entropy.const import etpConst, const_setup_perms, const_setup_file
 try:
diff --git a/libraries/entropy/misc.py b/libraries/entropy/misc.py
index 6ad048763..3286113d7 100644
--- a/libraries/entropy/misc.py
+++ b/libraries/entropy/misc.py
@@ -12,7 +12,6 @@
     related with the "Entropy metaphor".
 
 """
-from __future__ import with_statement
 import os
 import sys
 import time
diff --git a/libraries/entropy/qa.py b/libraries/entropy/qa.py
index f473b1126..e02ecc7e7 100644
--- a/libraries/entropy/qa.py
+++ b/libraries/entropy/qa.py
@@ -18,7 +18,6 @@
     exceptions (errors) submission.
 
 """
-from __future__ import with_statement
 import os
 import sys
 import subprocess
diff --git a/libraries/entropy/server/interfaces/main.py b/libraries/entropy/server/interfaces/main.py
index df4939b5f..dde13b65e 100644
--- a/libraries/entropy/server/interfaces/main.py
+++ b/libraries/entropy/server/interfaces/main.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 from entropy.core import Singleton
diff --git a/libraries/entropy/server/interfaces/mirrors.py b/libraries/entropy/server/interfaces/mirrors.py
index e9752b4aa..696956bb0 100644
--- a/libraries/entropy/server/interfaces/mirrors.py
+++ b/libraries/entropy/server/interfaces/mirrors.py
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Server Mirrors Interfaces}.
 
 """
-from __future__ import with_statement
 import os
 import tempfile
 import shutil
diff --git a/libraries/entropy/services/auth_interfaces.py b/libraries/entropy/services/auth_interfaces.py
index f12061019..6dc90628c 100644
--- a/libraries/entropy/services/auth_interfaces.py
+++ b/libraries/entropy/services/auth_interfaces.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import time
 import random
diff --git a/libraries/entropy/services/authenticators.py b/libraries/entropy/services/authenticators.py
index 90ce9d1fb..0884ded6e 100644
--- a/libraries/entropy/services/authenticators.py
+++ b/libraries/entropy/services/authenticators.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 
 from entropy.services.skel import Authenticator
 from entropy.services.auth_interfaces import phpBB3Auth
diff --git a/libraries/entropy/services/interfaces.py b/libraries/entropy/services/interfaces.py
index 86b3d2cc2..68433d610 100644
--- a/libraries/entropy/services/interfaces.py
+++ b/libraries/entropy/services/interfaces.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import select
 import shutil
diff --git a/libraries/entropy/services/repository/commands.py b/libraries/entropy/services/repository/commands.py
index e7625db86..3fb47661b 100644
--- a/libraries/entropy/services/repository/commands.py
+++ b/libraries/entropy/services/repository/commands.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 from entropy.services.skel import SocketCommands
 from entropy.const import etpConst
diff --git a/libraries/entropy/services/repository/interfaces.py b/libraries/entropy/services/repository/interfaces.py
index 9199f923c..7a93c4d73 100644
--- a/libraries/entropy/services/repository/interfaces.py
+++ b/libraries/entropy/services/repository/interfaces.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 from entropy.services.interfaces import SocketHost
diff --git a/libraries/entropy/services/system/executors.py b/libraries/entropy/services/system/executors.py
index b72f1dd9a..08bf5f1c2 100644
--- a/libraries/entropy/services/system/executors.py
+++ b/libraries/entropy/services/system/executors.py
@@ -9,7 +9,6 @@
     B{Entropy Services System Management Executors Interface}.
 
 """
-from __future__ import with_statement
 import os
 import sys
 import subprocess
diff --git a/libraries/entropy/services/system/interfaces.py b/libraries/entropy/services/system/interfaces.py
index b4ecbdf72..44004a11b 100644
--- a/libraries/entropy/services/system/interfaces.py
+++ b/libraries/entropy/services/system/interfaces.py
@@ -9,7 +9,6 @@
     B{Entropy Services System Management Interface}.
 
 """
-from __future__ import with_statement
 import time
 import os
 import random
diff --git a/libraries/entropy/services/ugc/commands.py b/libraries/entropy/services/ugc/commands.py
index 757c75914..933574a57 100644
--- a/libraries/entropy/services/ugc/commands.py
+++ b/libraries/entropy/services/ugc/commands.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import shutil
 from entropy.services.skel import SocketCommands
diff --git a/libraries/entropy/services/ugc/interfaces.py b/libraries/entropy/services/ugc/interfaces.py
index 888b1d57f..c65519e90 100644
--- a/libraries/entropy/services/ugc/interfaces.py
+++ b/libraries/entropy/services/ugc/interfaces.py
@@ -10,7 +10,6 @@
 
 """
 
-from __future__ import with_statement
 import os
 import sys
 import select
diff --git a/libraries/entropy/spm/plugins/interfaces/portage_plugin.py b/libraries/entropy/spm/plugins/interfaces/portage_plugin.py
index 9847bba72..047e27a89 100644
--- a/libraries/entropy/spm/plugins/interfaces/portage_plugin.py
+++ b/libraries/entropy/spm/plugins/interfaces/portage_plugin.py
@@ -9,7 +9,6 @@
     B{Entropy Source Package Manager "Portage" Plugin}.
 
 """
-from __future__ import with_statement
 import os
 import bz2
 import sys
diff --git a/libraries/entropy/tools.py b/libraries/entropy/tools.py
index 9b8ecdd3d..b5218e304 100644
--- a/libraries/entropy/tools.py
+++ b/libraries/entropy/tools.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Entropy miscellaneous tools module
-from __future__ import with_statement
 """
 
     @author: Fabio Erculiani <lxnay@sabayonlinux.org>
diff --git a/libraries/entropy/transceivers.py b/libraries/entropy/transceivers.py
index e2d733444..e46c021c2 100644
--- a/libraries/entropy/transceivers.py
+++ b/libraries/entropy/transceivers.py
@@ -9,7 +9,6 @@
     B{Entropy transceiver module}.
 
 """
-from __future__ import with_statement
 import os
 import urllib2
 import time
diff --git a/services/client-updates-daemon b/services/client-updates-daemon
index b67fd57ba..eb1b60e2b 100755
--- a/services/client-updates-daemon
+++ b/services/client-updates-daemon
@@ -9,7 +9,6 @@
     B{Entropy Package Manager Client service}.
 
 """
-from __future__ import with_statement
 import os
 import sys
 # this makes the daemon to not write the entropy pid file
diff --git a/sulfur/src/sulfur/dialogs.py b/sulfur/src/sulfur/dialogs.py
index 70ad349fd..320cf1e65 100644
--- a/sulfur/src/sulfur/dialogs.py
+++ b/sulfur/src/sulfur/dialogs.py
@@ -17,7 +17,6 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from __future__ import with_statement
 import time, gtk, gobject, pango, thread, pty, sys
 from entropy.i18n import _,_LOCALE
 from entropy.exceptions import *
diff --git a/sulfur/src/sulfur/setup.py b/sulfur/src/sulfur/setup.py
index 6112a3574..5444f824d 100644
--- a/sulfur/src/sulfur/setup.py
+++ b/sulfur/src/sulfur/setup.py
@@ -17,7 +17,6 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-from __future__ import with_statement
 import os, sys
 import entropy.tools as entropyTools
 from entropy.const import *