diff --git a/libraries/entropy/services/repository/commands.py b/libraries/entropy/services/repository/commands.py
index 3d931fbff..ca2bad139 100644
--- a/libraries/entropy/services/repository/commands.py
+++ b/libraries/entropy/services/repository/commands.py
@@ -104,7 +104,7 @@ class Repository(SocketCommands):
 
         dbpath = self.get_database_path(repository, arch, product, branch)
         dbconn = self.HostInterface.open_db(dbpath, docache = False)
-        mychecksum = dbconn.database_checksum(do_order = True, strict = False, strings = True)
+        mychecksum = dbconn.checksum(do_order = True, strict = False, strings = True)
         myids = dbconn.listAllIdpackages()
         dbconn.closeDB()
         foreign_idpackages = set(foreign_idpackages)
diff --git a/libraries/entropy/services/system/commands.py b/libraries/entropy/services/system/commands.py
index d381342dc..2437fcb06 100644
--- a/libraries/entropy/services/system/commands.py
+++ b/libraries/entropy/services/system/commands.py
@@ -970,8 +970,6 @@ class Repository(SocketCommands):
             data['available'].pop(etpConst['clientserverrepoid'])
         data['community_mode'] = self.HostInterface.Entropy.community_repo
         data['current'] = self.HostInterface.Entropy.default_repository
-        sys_settings_srv_plugin_id = \
-            etpConst['system_settings_plugins_ids']['server_plugin']
         data['branch'] = self.HostInterface.Entropy.SystemSettings['repositories']['branch']
         return True, data
 
diff --git a/libraries/entropy/services/ugc/interfaces.py b/libraries/entropy/services/ugc/interfaces.py
index eab3f1708..e1b863ec9 100644
--- a/libraries/entropy/services/ugc/interfaces.py
+++ b/libraries/entropy/services/ugc/interfaces.py
@@ -466,7 +466,6 @@ class Server(RemoteDatabase):
 
     def get_ugc_metadata_doctypes(self, pkgkey, typeslist):
         self.check_connection()
-        metadata = []
         self.execute_query("""
             SELECT * FROM entropy_docs,entropy_base WHERE 
             entropy_docs.`idkey` = entropy_base.`idkey` AND 
@@ -1717,7 +1716,6 @@ class Client:
     import entropy.dump as dumpTools
     import entropy.tools as entropyTools
     import zlib
-    import select
     def __init__(self, OutputInterface, ClientCommandsClass, quiet = False, show_progress = True, output_header = '', ssl = False, socket_timeout = 25):
         #, server_ca_cert = None, server_cert = None):