diff --git a/gitlab_deps/server.py b/gitlab_deps/server.py
index 9d0952d1d4ae9d28a4dae7aaa16c79a65e4666f1..ec652095afcfa44a816820fa9b0b68dde19b26e6 100644
--- a/gitlab_deps/server.py
+++ b/gitlab_deps/server.py
@@ -1,9 +1,6 @@
 import logging
 import threading
-try:
-    import Queue
-except ImportError:
-    import queue as Queue
+from queue import Queue
 
 from cheroot import wsgi
 from flask import Flask, request, make_response, abort
@@ -11,7 +8,7 @@ from flask import Flask, request, make_response, abort
 from .rebuild import rebuild
 
 
-queue = Queue.Queue()
+queue = Queue()
 
 
 def _process_request(gl, project_deps, data):
@@ -61,8 +58,8 @@ def run_app(gl, project_deps, bind_host, bind_port,
         wt = threading.Thread(
             target=worker_thread,
             args=(gl, project_deps),
-            name='Worker %d' % (i+1))
-        wt.setDaemon(True)
+            name='Worker %d' % (i+1),
+            daemon=True)
         wt.start()
 
     # Start the HTTP server to receive webhook requests.