diff --git a/core/support.py b/core/support.py
index c8422456..5a7cadab 100755
--- a/core/support.py
+++ b/core/support.py
@@ -1127,8 +1127,6 @@ def pagination(itemlist, item, page, perpage, function_level=1):
 
 def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, Download=True, patronTag=None, Videolibrary=True):
     logger.debug()
-    blacklisted_servers = config.get_setting("black_list", server='servers')
-    if not blacklisted_servers: blacklisted_servers = []
     if not data and not itemlist:
         data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
     if data:
@@ -1174,7 +1172,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
     with futures.ThreadPoolExecutor() as executor:
         thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url]
         for it in futures.as_completed(thL):
-            if it.result() and it.result().server.lower() not in blacklisted_servers:
+            if it.result() and not config.get_setting("black_list", server=it.result().server.lower()):
                 verifiedItemlist.append(it.result())
     try:
         verifiedItemlist.sort(key=lambda it: int(re.sub(r'\D','',it.quality)))
diff --git a/platformcode/logger.py b/platformcode/logger.py
index 47d6740d..263bee7a 100644
--- a/platformcode/logger.py
+++ b/platformcode/logger.py
@@ -3,7 +3,7 @@
 # Logger (kodi)
 # --------------------------------------------------------------------------------
 from __future__ import unicode_literals
-import inspect, os, xbmc, sys
+import inspect,os, xbmc, sys
 from platformcode import config
 
 # for test suite
diff --git a/specials/setting.py b/specials/setting.py
index cba4ac44..2de2882e 100644
--- a/specials/setting.py
+++ b/specials/setting.py
@@ -269,11 +269,9 @@ def cb_servers_blacklist(dict_values):
     n = len(dict_values)
     i = 1
     for k, v in list(dict_values.items()):
-        config.set_setting("black_list", v, server=k)
         if v:  # If the server is blacklisted it cannot be in the favorites list
             config.set_setting("favorites_servers_list", 0, server=k)
             blaklisted.append(k)
-            f = True
             progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % k)
         i += 1
     config.set_setting("black_list", blaklisted, server='servers')