diff --git a/jellyfin_kodi/downloader.py b/jellyfin_kodi/downloader.py
index 89946498..147efece 100644
--- a/jellyfin_kodi/downloader.py
+++ b/jellyfin_kodi/downloader.py
@@ -7,7 +7,7 @@ import threading
 import concurrent.futures
 from datetime import date
 
-from six.moves import range, queue as Queue
+import queue
 
 import requests
 
@@ -308,7 +308,7 @@ class GetItemWorker(threading.Thread):
             while True:
                 try:
                     item_ids = self.queue.get(timeout=1)
-                except Queue.Empty:
+                except queue.Empty:
 
                     self.is_done = True
                     LOG.info("--<[ q:download/%s ]", id(self))
diff --git a/jellyfin_kodi/library.py b/jellyfin_kodi/library.py
index a200f37d..5c1b5a90 100644
--- a/jellyfin_kodi/library.py
+++ b/jellyfin_kodi/library.py
@@ -6,7 +6,7 @@ from __future__ import division, absolute_import, print_function, unicode_litera
 import threading
 from datetime import datetime, timedelta
 
-from six.moves import queue as Queue
+import queue
 
 from kodi_six import xbmc, xbmcgui
 
@@ -48,13 +48,13 @@ class Library(threading.Thread):
         self.monitor = monitor
         self.player = monitor.monitor.player
         self.server = Jellyfin().get_client()
-        self.updated_queue = Queue.Queue()
-        self.userdata_queue = Queue.Queue()
-        self.removed_queue = Queue.Queue()
+        self.updated_queue = queue.Queue()
+        self.userdata_queue = queue.Queue()
+        self.removed_queue = queue.Queue()
         self.updated_output = self.__new_queues__()
         self.userdata_output = self.__new_queues__()
         self.removed_output = self.__new_queues__()
-        self.notify_output = Queue.Queue()
+        self.notify_output = queue.Queue()
 
         self.jellyfin_threads = []
         self.download_threads = []
@@ -67,16 +67,16 @@ class Library(threading.Thread):
 
     def __new_queues__(self):
         return {
-            "Movie": Queue.Queue(),
-            "BoxSet": Queue.Queue(),
-            "MusicVideo": Queue.Queue(),
-            "Series": Queue.Queue(),
-            "Season": Queue.Queue(),
-            "Episode": Queue.Queue(),
-            "MusicAlbum": Queue.Queue(),
-            "MusicArtist": Queue.Queue(),
-            "AlbumArtist": Queue.Queue(),
-            "Audio": Queue.Queue(),
+            "Movie": queue.Queue(),
+            "BoxSet": queue.Queue(),
+            "MusicVideo": queue.Queue(),
+            "Series": queue.Queue(),
+            "Season": queue.Queue(),
+            "Episode": queue.Queue(),
+            "MusicAlbum": queue.Queue(),
+            "MusicArtist": queue.Queue(),
+            "AlbumArtist": queue.Queue(),
+            "Audio": queue.Queue(),
         }
 
     def run(self):
@@ -271,13 +271,13 @@ class Library(threading.Thread):
 
     def worker_downloads(self):
         """Get items from jellyfin and place them in the appropriate queues."""
-        for queue in (
+        for work_queue in (
             (self.updated_queue, self.updated_output),
             (self.userdata_queue, self.userdata_output),
         ):
-            if queue[0].qsize() and len(self.download_threads) < DTHREADS:
+            if work_queue[0].qsize() and len(self.download_threads) < DTHREADS:
 
-                new_thread = GetItemWorker(self.server, queue[0], queue[1])
+                new_thread = GetItemWorker(self.server, work_queue[0], work_queue[1])
                 new_thread.start()
                 LOG.info("-->[ q:download/%s ]", id(new_thread))
                 self.download_threads.append(new_thread)
@@ -722,7 +722,7 @@ class UpdateWorker(threading.Thread):
 
                 try:
                     item = self.queue.get(timeout=1)
-                except Queue.Empty:
+                except queue.Empty:
                     break
 
                 try:
@@ -801,7 +801,7 @@ class UserDataWorker(threading.Thread):
 
                 try:
                     item = self.queue.get(timeout=1)
-                except Queue.Empty:
+                except queue.Empty:
                     break
 
                 try:
@@ -852,7 +852,7 @@ class SortWorker(threading.Thread):
 
                 try:
                     item_id = self.queue.get(timeout=1)
-                except Queue.Empty:
+                except queue.Empty:
                     break
 
                 try:
@@ -918,7 +918,7 @@ class RemovedWorker(threading.Thread):
 
                 try:
                     item = self.queue.get(timeout=1)
-                except Queue.Empty:
+                except queue.Empty:
                     break
 
                 if item["Type"] == "Movie":
@@ -970,7 +970,7 @@ class NotifyWorker(threading.Thread):
 
             try:
                 item = self.queue.get(timeout=3)
-            except Queue.Empty:
+            except queue.Empty:
                 break
 
             time = self.music_time if item[0] == "Audio" else self.video_time