diff --git a/server/eit/commands/add.py b/server/eit/commands/add.py
index fb0874799..12712ab8a 100644
--- a/server/eit/commands/add.py
+++ b/server/eit/commands/add.py
@@ -13,15 +13,7 @@ import sys
 import os
 import argparse
 
-from entropy.const import etpConst
 from entropy.i18n import _
-from entropy.exceptions import PermissionDenied
-from entropy.output import print_error, darkgreen, \
-    teal, brown, darkred, bold, purple, blue
-
-from text_tools import print_table
-
-import entropy.tools
 
 from eit.commands.descriptor import EitCommandDescriptor
 from eit.commands.commit import EitCommit
diff --git a/server/eit/commands/bump.py b/server/eit/commands/bump.py
index bd30e0354..9de0ad569 100644
--- a/server/eit/commands/bump.py
+++ b/server/eit/commands/bump.py
@@ -13,14 +13,8 @@ import sys
 import os
 import argparse
 
-from entropy.const import etpConst
 from entropy.output import darkgreen, blue
 from entropy.i18n import _
-from entropy.exceptions import PermissionDenied
-
-from text_tools import print_table
-
-import entropy.tools
 
 from eit.commands.descriptor import EitCommandDescriptor
 from eit.commands.command import EitCommand
diff --git a/server/eit/commands/command.py b/server/eit/commands/command.py
index 0e01ae809..e0ff4c5f9 100644
--- a/server/eit/commands/command.py
+++ b/server/eit/commands/command.py
@@ -11,6 +11,7 @@
 """
 from entropy.const import etpConst
 from entropy.output import darkgreen, print_error
+from entropy.exceptions import PermissionDenied
 from entropy.server.interfaces import Server
 from entropy.core.settings.base import SystemSettings
 
diff --git a/server/eit/commands/commit.py b/server/eit/commands/commit.py
index 58d2cb336..b256a24cd 100644
--- a/server/eit/commands/commit.py
+++ b/server/eit/commands/commit.py
@@ -13,13 +13,9 @@ import sys
 import os
 import argparse
 
-from entropy.const import etpConst
 from entropy.i18n import _
-from entropy.exceptions import PermissionDenied
-from entropy.output import print_error, darkgreen, teal, brown, \
-    darkred, bold, purple, blue, red, green
-
-from text_tools import print_table
+from entropy.output import darkgreen, teal, brown, \
+    darkred, bold, purple, blue, red
 
 import entropy.tools
 
diff --git a/server/eit/commands/repack.py b/server/eit/commands/repack.py
index ab98cb9d5..19c395acc 100644
--- a/server/eit/commands/repack.py
+++ b/server/eit/commands/repack.py
@@ -13,15 +13,7 @@ import sys
 import os
 import argparse
 
-from entropy.const import etpConst
 from entropy.i18n import _
-from entropy.exceptions import PermissionDenied
-from entropy.output import print_error, darkgreen, \
-    teal, brown, darkred, bold, purple, blue
-
-from text_tools import print_table
-
-import entropy.tools
 
 from eit.commands.descriptor import EitCommandDescriptor
 from eit.commands.commit import EitCommit
diff --git a/server/eit/commands/status.py b/server/eit/commands/status.py
index 581ed29e9..0935c2930 100644
--- a/server/eit/commands/status.py
+++ b/server/eit/commands/status.py
@@ -15,14 +15,11 @@ import argparse
 
 from entropy.const import etpConst
 from entropy.i18n import _
-from entropy.exceptions import PermissionDenied
-from entropy.output import print_error, darkgreen, \
-    teal, brown, darkred, bold, purple, blue
+from entropy.output import darkgreen, teal, brown, darkred, \
+    bold, purple, blue
 
 from text_tools import print_table
 
-import entropy.tools
-
 from eit.commands.descriptor import EitCommandDescriptor
 from eit.commands.command import EitCommand