diff --git a/.gitignore b/.gitignore
index bb42fe1..81bceaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
-lib64/
 parts/
 sdist/
 var/
diff --git a/pywebdav/lib/WebDAVServer.py b/pywebdav/lib/WebDAVServer.py
index 85d6a66..a406f81 100644
--- a/pywebdav/lib/WebDAVServer.py
+++ b/pywebdav/lib/WebDAVServer.py
@@ -4,8 +4,8 @@
 
 """
 from . import AuthServer
-from six.moves import urllib
 import logging
+import urllib.parse
 
 from .propfind import PROPFIND
 from .report import REPORT
diff --git a/pywebdav/lib/davcmd.py b/pywebdav/lib/davcmd.py
index e4493e3..ed11dab 100644
--- a/pywebdav/lib/davcmd.py
+++ b/pywebdav/lib/davcmd.py
@@ -8,11 +8,10 @@
 
 """
 
-from six.moves import urllib
+import urllib.parse
 
 from .utils import create_treelist, is_prefix
-from .errors import *
-from six.moves import range
+from .errors import DAV_Error, DAV_NotFound
 import os
 
 def deltree(dc,uri,exclude={}):
diff --git a/pywebdav/lib/davcopy.py b/pywebdav/lib/davcopy.py
index 823fad9..d0b17e9 100644
--- a/pywebdav/lib/davcopy.py
+++ b/pywebdav/lib/davcopy.py
@@ -2,12 +2,12 @@
 domimpl = xml.dom.minidom.getDOMImplementation()
 
 import string
-from six.moves import urllib
+import urllib.parse
 from io import StringIO
 
 from . import utils
 from .constants import COLLECTION, OBJECT, DAV_PROPS, RT_ALLPROP, RT_PROPNAME, RT_PROP
-from .errors import *
+from .errors import DAV_Error
 from .utils import create_treelist, quote_uri, gen_estring
 
 class COPY:
diff --git a/pywebdav/lib/davmove.py b/pywebdav/lib/davmove.py
index cf03161..0e59975 100644
--- a/pywebdav/lib/davmove.py
+++ b/pywebdav/lib/davmove.py
@@ -1,9 +1,9 @@
-from six.moves import urllib
+import urllib.parse
 
 from . import utils
 from .constants import COLLECTION, OBJECT, DAV_PROPS
 from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
-from .errors import *
+from .errors import DAV_Error
 from .utils import create_treelist, quote_uri, gen_estring, make_xmlresponse, is_prefix
 from .davcmd import moveone, movetree
 
diff --git a/pywebdav/lib/iface.py b/pywebdav/lib/iface.py
index 028c584..93062c1 100644
--- a/pywebdav/lib/iface.py
+++ b/pywebdav/lib/iface.py
@@ -9,7 +9,7 @@
 
 from xml.dom import minidom
 from .locks import LockManager
-from .errors import *
+from .errors import DAV_Forbidden, DAV_NotFound
 
 import time
 
diff --git a/pywebdav/lib/locks.py b/pywebdav/lib/locks.py
index c928f7c..6c585b0 100644
--- a/pywebdav/lib/locks.py
+++ b/pywebdav/lib/locks.py
@@ -1,5 +1,5 @@
 import time
-from six.moves import urllib
+import urllib.parse
 import uuid
 
 import logging
@@ -10,7 +10,6 @@
 from xml.dom import minidom
 
 from .utils import rfc1123_date, IfParser, tokenFinder
-from .errors import *
 
 tokens_to_lock = {}
 uris_to_token = {}
diff --git a/pywebdav/lib/propfind.py b/pywebdav/lib/propfind.py
index bc2ea20..d2d6843 100644
--- a/pywebdav/lib/propfind.py
+++ b/pywebdav/lib/propfind.py
@@ -2,7 +2,7 @@
 domimpl = xml.dom.minidom.getDOMImplementation()
 
 import logging
-from six.moves import urllib
+import urllib.parse
 
 from . import utils
 from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
diff --git a/pywebdav/lib/utils.py b/pywebdav/lib/utils.py
index ec9f631..4533f25 100755
--- a/pywebdav/lib/utils.py
+++ b/pywebdav/lib/utils.py
@@ -3,7 +3,8 @@
 import os
 
 from xml.dom import minidom
-from six.moves import urllib
+import urllib.parse
+
 from .constants import RT_ALLPROP, RT_PROPNAME, RT_PROP
 from six.moves.BaseHTTPServer import BaseHTTPRequestHandler
 
diff --git a/pywebdav/server/fshandler.py b/pywebdav/server/fshandler.py
index d460a42..62495d3 100644
--- a/pywebdav/server/fshandler.py
+++ b/pywebdav/server/fshandler.py
@@ -4,10 +4,10 @@
 import types
 import shutil
 from io import StringIO
-from six.moves import urllib
+import urllib.parse
 from pywebdav.lib.constants import COLLECTION, OBJECT
-from pywebdav.lib.errors import *
-from pywebdav.lib.iface import *
+from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound, DAV_Requested_Range_Not_Satisfiable, DAV_Secret
+from pywebdav.lib.iface import dav_interface
 from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
 from html import escape