diff --git a/docs/conf.py b/docs/conf.py
index c9fbffcdb..70ad82869 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # Django FileBrowser documentation build configuration file, created by
 # sphinx-quickstart on Sun Dec  5 19:11:46 2010.
 #
@@ -43,8 +41,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Django FileBrowser'
-copyright = u'2022, Patrick Kranzlmueller'
+project = 'Django FileBrowser'
+copyright = '2022, Patrick Kranzlmueller'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -182,8 +180,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'DjangoFileBrowser.tex', u'Django FileBrowser Documentation',
-   u'Patrick Kranzlmueller', 'manual'),
+  ('index', 'DjangoFileBrowser.tex', 'Django FileBrowser Documentation',
+   'Patrick Kranzlmueller', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -215,8 +213,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'djangofilebrowser', u'Django FileBrowser Documentation',
-     [u'Patrick Kranzlmueller'], 1)
+    ('index', 'djangofilebrowser', 'Django FileBrowser Documentation',
+     ['Patrick Kranzlmueller'], 1)
 ]
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
diff --git a/docs/fieldswidgets.rst b/docs/fieldswidgets.rst
index 07e8bce2e..0784e2bce 100644
--- a/docs/fieldswidgets.rst
+++ b/docs/fieldswidgets.rst
@@ -90,7 +90,7 @@ Return a :ref:`fileobject` from a `FileField <https://docs.djangoproject.com/en/
 
     from filebrowser.base import FileObject
 
-    image_upload = models.ImageField(u"Image (Upload)", max_length=250, upload_to=image_upload_path, blank=True)
+    image_upload = models.ImageField("Image (Upload)", max_length=250, upload_to=image_upload_path, blank=True)
 
     def image(self):
         if self.image_upload:
diff --git a/filebrowser/actions.py b/filebrowser/actions.py
index 905b14244..372d02357 100644
--- a/filebrowser/actions.py
+++ b/filebrowser/actions.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import os
 import tempfile
 
@@ -52,33 +50,33 @@ def transpose_image(request, fileobjects, operation):
 def flip_horizontal(request, fileobjects):
     "Flip image horizontally"
     transpose_image(request, fileobjects, 0)
-flip_horizontal.short_description = _(u'Flip horizontal')
+flip_horizontal.short_description = _('Flip horizontal')
 flip_horizontal.applies_to = applies_to_all_images
 
 
 def flip_vertical(request, fileobjects):
     "Flip image vertically"
     transpose_image(request, fileobjects, 1)
-flip_vertical.short_description = _(u'Flip vertical')
+flip_vertical.short_description = _('Flip vertical')
 flip_vertical.applies_to = applies_to_all_images
 
 
 def rotate_90_clockwise(request, fileobjects):
     "Rotate image 90 degrees clockwise"
     transpose_image(request, fileobjects, 4)
-rotate_90_clockwise.short_description = _(u'Rotate 90° CW')
+rotate_90_clockwise.short_description = _('Rotate 90° CW')
 rotate_90_clockwise.applies_to = applies_to_all_images
 
 
 def rotate_90_counterclockwise(request, fileobjects):
     "Rotate image 90 degrees counterclockwise"
     transpose_image(request, fileobjects, 2)
-rotate_90_counterclockwise.short_description = _(u'Rotate 90° CCW')
+rotate_90_counterclockwise.short_description = _('Rotate 90° CCW')
 rotate_90_counterclockwise.applies_to = applies_to_all_images
 
 
 def rotate_180(request, fileobjects):
     "Rotate image 180 degrees"
     transpose_image(request, fileobjects, 3)
-rotate_180.short_description = _(u'Rotate 180°')
+rotate_180.short_description = _('Rotate 180°')
 rotate_180.applies_to = applies_to_all_images
diff --git a/filebrowser/base.py b/filebrowser/base.py
index 1cda6148f..c0ef842d2 100644
--- a/filebrowser/base.py
+++ b/filebrowser/base.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import datetime
 import mimetypes
 import os
@@ -7,8 +5,6 @@
 import tempfile
 import time
 
-from six import python_2_unicode_compatible, string_types
-
 from django.core.files import File
 from django.utils.encoding import force_str
 from django.utils.functional import cached_property
@@ -82,7 +78,7 @@ def sort_by_attr(self, seq, attr):
         the sorted list of objects.
         """
         from operator import attrgetter
-        if isinstance(attr, string_types):  # Backward compatibility hack
+        if isinstance(attr, str):  # Backward compatibility hack
             attr = (attr, )
         return sorted(seq, key=attrgetter(*attr))
 
@@ -200,7 +196,6 @@ def results_walk_filtered(self):
         return len(self.files_walk_filtered())
 
 
-@python_2_unicode_compatible
 class FileObject():
     """
     The FileObject represents a file (or directory) on the server.
diff --git a/filebrowser/decorators.py b/filebrowser/decorators.py
index 280b938e3..13c2814b3 100644
--- a/filebrowser/decorators.py
+++ b/filebrowser/decorators.py
@@ -1,19 +1,16 @@
-# coding: utf-8
-
 import os
 
 from django.contrib import messages
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponseRedirect
 from django.urls import reverse
-from django.utils.encoding import smart_str
 from django.utils.translation import gettext as _
 
 from filebrowser.templatetags.fb_tags import query_helper
 
 
 def get_path(path, site):
-    converted_path = smart_str(os.path.join(site.directory, path))
+    converted_path = os.path.join(site.directory, path)
     if not path.startswith('.') and not os.path.isabs(converted_path):
         if site.storage.isdir(converted_path):
             return path
@@ -21,7 +18,7 @@ def get_path(path, site):
 
 def get_file(path, filename, site):
     # Files and directories are valid
-    converted_path = smart_str(os.path.join(site.directory, path, filename))
+    converted_path = os.path.join(site.directory, path, filename)
     if not path.startswith('.') and not filename.startswith('.') and not os.path.isabs(converted_path):
         if site.storage.isfile(converted_path) or site.storage.isdir(converted_path):
             return filename
@@ -38,7 +35,7 @@ def decorator(request, *args, **kwargs):
         if get_path(request.GET.get('dir', ''), site=site) is None:
             msg = _('The requested Folder does not exist.')
             messages.add_message(request, messages.ERROR, msg)
-            redirect_url = reverse("filebrowser:fb_browse", current_app=site.name) + query_helper(request.GET, u"", "dir")
+            redirect_url = reverse("filebrowser:fb_browse", current_app=site.name) + query_helper(request.GET, "", "dir")
             return HttpResponseRedirect(redirect_url)
         return function(request, *args, **kwargs)
     return decorator
@@ -52,7 +49,7 @@ def decorator(request, *args, **kwargs):
         if file_path is None:
             msg = _('The requested File does not exist.')
             messages.add_message(request, messages.ERROR, msg)
-            redirect_url = reverse("filebrowser:fb_browse", current_app=site.name) + query_helper(request.GET, u"", "dir")
+            redirect_url = reverse("filebrowser:fb_browse", current_app=site.name) + query_helper(request.GET, "", "dir")
             return HttpResponseRedirect(redirect_url)
         return function(request, *args, **kwargs)
     return decorator
diff --git a/filebrowser/fields.py b/filebrowser/fields.py
index aeec94fb9..d48adf2ee 100644
--- a/filebrowser/fields.py
+++ b/filebrowser/fields.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 import os
 
 from django import forms
@@ -57,7 +56,7 @@ def render(self, name, value, attrs=None, renderer=None):
 class FileBrowseFormField(forms.CharField):
 
     default_error_messages = {
-        'extension': _(u'Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
+        'extension': _('Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
     }
 
     def __init__(self, max_length=None, min_length=None, site=None, directory=None, extensions=None, format=None, *args, **kwargs):
@@ -180,7 +179,7 @@ def render(self, name, value, attrs=None, renderer=None):
 class FileBrowseUploadFormField(forms.CharField):
 
     default_error_messages = {
-        'extension': _(u'Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
+        'extension': _('Extension %(ext)s is not allowed. Only %(allowed)s is allowed.'),
     }
 
     def __init__(self, max_length=None, min_length=None, site=None, directory=None, extensions=None, format=None, upload_to=None, temp_upload_dir=None, *args, **kwargs):
diff --git a/filebrowser/forms.py b/filebrowser/forms.py
index 25d46fa4c..ca0c4def8 100644
--- a/filebrowser/forms.py
+++ b/filebrowser/forms.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import os
 import re
 
@@ -13,12 +11,12 @@
 ALNUM_NAME_RE = re.compile(FOLDER_REGEX, re.U)
 
 TRANSPOSE_CHOICES = (
-    ("", u"-----"),
-    ("0", _(u"Flip horizontal")),
-    ("1", _(u"Flip vertical")),
-    ("2", _(u"Rotate 90° CW")),
-    ("4", _(u"Rotate 90° CCW")),
-    ("3", _(u"Rotate 180°")),
+    ("", "-----"),
+    ("0", _("Flip horizontal")),
+    ("1", _("Flip vertical")),
+    ("2", _("Rotate 90° CW")),
+    ("4", _("Rotate 90° CCW")),
+    ("3", _("Rotate 180°")),
 )
 
 
@@ -27,7 +25,7 @@ class CreateDirForm(forms.Form):
     Form for creating a folder.
     """
 
-    name = forms.CharField(widget=forms.TextInput(attrs=dict({'class': 'vTextField'}, max_length=50, min_length=3)), label=_(u'Name'), help_text=_(u'Only letters, numbers, underscores, spaces and hyphens are allowed.'), required=True)
+    name = forms.CharField(widget=forms.TextInput(attrs=dict({'class': 'vTextField'}, max_length=50, min_length=3)), label=_('Name'), help_text=_('Only letters, numbers, underscores, spaces and hyphens are allowed.'), required=True)
 
     def __init__(self, path, *args, **kwargs):
         self.path = path
@@ -39,10 +37,10 @@ def clean_name(self):
         if self.cleaned_data['name']:
             # only letters, numbers, underscores, spaces and hyphens are allowed.
             if not ALNUM_NAME_RE.search(self.cleaned_data['name']):
-                raise forms.ValidationError(_(u'Only letters, numbers, underscores, spaces and hyphens are allowed.'))
+                raise forms.ValidationError(_('Only letters, numbers, underscores, spaces and hyphens are allowed.'))
             # Folder must not already exist.
             if self.site.storage.isdir(os.path.join(self.path, convert_filename(self.cleaned_data['name']))):
-                raise forms.ValidationError(_(u'The Folder already exists.'))
+                raise forms.ValidationError(_('The Folder already exists.'))
         return convert_filename(self.cleaned_data['name'])
 
 
@@ -51,8 +49,8 @@ class ChangeForm(forms.Form):
     Form for renaming a file/folder.
     """
 
-    custom_action = forms.ChoiceField(label=_(u'Actions'), required=False)
-    name = forms.CharField(widget=forms.TextInput(attrs=dict({'class': 'vTextField'}, max_length=50, min_length=3)), label=_(u'Name'), help_text=_(u'Only letters, numbers, underscores, spaces and hyphens are allowed.'), required=True)
+    custom_action = forms.ChoiceField(label=_('Actions'), required=False)
+    name = forms.CharField(widget=forms.TextInput(attrs=dict({'class': 'vTextField'}, max_length=50, min_length=3)), label=_('Name'), help_text=_('Only letters, numbers, underscores, spaces and hyphens are allowed.'), required=True)
 
     def __init__(self, *args, **kwargs):
         self.path = kwargs.pop("path", None)
@@ -61,7 +59,7 @@ def __init__(self, *args, **kwargs):
         super(ChangeForm, self).__init__(*args, **kwargs)
 
         # Initialize choices of custom action
-        choices = [("", u"-----")]
+        choices = [("", "-----")]
         for name, action in self.site.applicable_actions(self.fileobject):
             choices.append((name, action.short_description))
         self.fields['custom_action'].choices = choices
@@ -71,10 +69,10 @@ def clean_name(self):
         if self.cleaned_data['name']:
             # only letters, numbers, underscores, spaces and hyphens are allowed.
             if not ALNUM_NAME_RE.search(self.cleaned_data['name']):
-                raise forms.ValidationError(_(u'Only letters, numbers, underscores, spaces and hyphens are allowed.'))
+                raise forms.ValidationError(_('Only letters, numbers, underscores, spaces and hyphens are allowed.'))
             #  folder/file must not already exist.
             if self.site.storage.isdir(os.path.join(self.path, convert_filename(self.cleaned_data['name']))) and os.path.join(self.path, convert_filename(self.cleaned_data['name'])) != self.fileobject.path:
-                raise forms.ValidationError(_(u'The Folder already exists.'))
+                raise forms.ValidationError(_('The Folder already exists.'))
             elif self.site.storage.isfile(os.path.join(self.path, convert_filename(self.cleaned_data['name']))) and os.path.join(self.path, convert_filename(self.cleaned_data['name'])) != self.fileobject.path:
-                raise forms.ValidationError(_(u'The File already exists.'))
+                raise forms.ValidationError(_('The File already exists.'))
         return convert_filename(self.cleaned_data['name'])
diff --git a/filebrowser/management/commands/fb_version_generate.py b/filebrowser/management/commands/fb_version_generate.py
index 419240166..c4a1c67b4 100644
--- a/filebrowser/management/commands/fb_version_generate.py
+++ b/filebrowser/management/commands/fb_version_generate.py
@@ -1,10 +1,6 @@
-# coding: utf-8
-
 import os
 import re
 
-from six.moves import input
-
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from filebrowser.base import FileListing
diff --git a/filebrowser/management/commands/fb_version_remove.py b/filebrowser/management/commands/fb_version_remove.py
index ab378a273..b9c373021 100644
--- a/filebrowser/management/commands/fb_version_remove.py
+++ b/filebrowser/management/commands/fb_version_remove.py
@@ -1,10 +1,7 @@
-# coding: utf-8
 import os
 import re
 import sys
 
-from six.moves import input
-
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
 from filebrowser.settings import EXCLUDE, EXTENSIONS
diff --git a/filebrowser/namers.py b/filebrowser/namers.py
index d0342420d..053880c4f 100644
--- a/filebrowser/namers.py
+++ b/filebrowser/namers.py
@@ -1,9 +1,5 @@
-from __future__ import unicode_literals
-
 import re
 
-import six
-
 from django.utils.encoding import force_str
 from django.utils.module_loading import import_string
 
@@ -15,7 +11,7 @@ def get_namer(**kwargs):
     return namer_cls(**kwargs)
 
 
-class VersionNamer(object):
+class VersionNamer:
     "Base namer only for reference"
 
     def __init__(self, **kwargs):
@@ -88,11 +84,11 @@ def options_list(self):
             if v is True:
                 opts.append(k)
                 continue
-            if not isinstance(v, six.string_types):
+            if not isinstance(v, str):
                 try:
-                    v = 'x'.join([six.text_type(v) for item in v])
+                    v = 'x'.join([str(v) for item in v])
                 except TypeError:
-                    v = six.text_type(v)
+                    v = str(v)
             opts.append('%s-%s' % (k, v))
 
         return opts
diff --git a/filebrowser/settings.py b/filebrowser/settings.py
index 8430af2a8..d37dc155a 100644
--- a/filebrowser/settings.py
+++ b/filebrowser/settings.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
diff --git a/filebrowser/signals.py b/filebrowser/signals.py
index b02889d9d..ab609b7d4 100644
--- a/filebrowser/signals.py
+++ b/filebrowser/signals.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from django.dispatch import Signal
 
 # upload signals
diff --git a/filebrowser/sites.py b/filebrowser/sites.py
index 056544534..14caf76f8 100644
--- a/filebrowser/sites.py
+++ b/filebrowser/sites.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 import os
 import re
 from time import gmtime, localtime, strftime, time
@@ -14,7 +12,6 @@
 from django.shortcuts import HttpResponse, render
 from django.template import RequestContext as Context
 from django.urls import get_resolver, get_urlconf, reverse
-from django.utils.encoding import smart_str
 from django.utils.translation import gettext as _
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_exempt
@@ -171,7 +168,7 @@ def filebrowser_view(view):
     return staff_member_required(never_cache(view))
 
 
-class FileBrowserSite(object):
+class FileBrowserSite:
     """
     A filebrowser.site defines admin views for browsing your servers media files.
     """
@@ -293,7 +290,7 @@ def filter_browse(item):
             return True
 
         query = request.GET.copy()
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = os.path.join(self.directory, query.get('dir', ''))
 
         filelisting = self.filelisting_class(
             path,
@@ -351,7 +348,7 @@ def filter_browse(item):
             'page': page,
             'filelisting': filelisting,
             'query': query,
-            'title': _(u'FileBrowser'),
+            'title': _('FileBrowser'),
             'settings_var': get_settings_var(directory=self.directory),
             'breadcrumbs': get_breadcrumbs(query, query.get('dir', '')),
             'breadcrumbs_title': "",
@@ -362,7 +359,7 @@ def createdir(self, request):
         "Create Directory"
         from filebrowser.forms import CreateDirForm
         query = request.GET
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = os.path.join(self.directory, query.get('dir', ''))
 
         if request.method == 'POST':
             form = CreateDirForm(path, request.POST, filebrowser_site=self)
@@ -388,10 +385,10 @@ def createdir(self, request):
         return render(request, 'filebrowser/createdir.html', {
             'form': form,
             'query': query,
-            'title': _(u'New Folder'),
+            'title': _('New Folder'),
             'settings_var': get_settings_var(directory=self.directory),
             'breadcrumbs': get_breadcrumbs(query, query.get('dir', '')),
-            'breadcrumbs_title': _(u'New Folder'),
+            'breadcrumbs_title': _('New Folder'),
             'filebrowser_site': self
         })
 
@@ -402,17 +399,17 @@ def upload(self, request):
         request.current_app = self.name
         return render(request, 'filebrowser/upload.html', {
             'query': query,
-            'title': _(u'Select files to upload'),
+            'title': _('Select files to upload'),
             'settings_var': get_settings_var(directory=self.directory),
             'breadcrumbs': get_breadcrumbs(query, query.get('dir', '')),
-            'breadcrumbs_title': _(u'Upload'),
+            'breadcrumbs_title': _('Upload'),
             'filebrowser_site': self
         })
 
     def delete_confirm(self, request):
         "Delete existing File/Directory."
         query = request.GET
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = os.path.join(self.directory, query.get('dir', ''))
         fileobject = FileObject(os.path.join(path, query.get('filename', '')), site=self)
         if fileobject.filetype == "Folder":
             filelisting = self.filelisting_class(
@@ -436,17 +433,17 @@ def delete_confirm(self, request):
             'filelisting': filelisting,
             'additional_files': additional_files,
             'query': query,
-            'title': _(u'Confirm delete'),
+            'title': _('Confirm delete'),
             'settings_var': get_settings_var(directory=self.directory),
             'breadcrumbs': get_breadcrumbs(query, query.get('dir', '')),
-            'breadcrumbs_title': _(u'Confirm delete'),
+            'breadcrumbs_title': _('Confirm delete'),
             'filebrowser_site': self
         })
 
     def delete(self, request):
         "Delete existing File/Directory."
         query = request.GET
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = os.path.join(self.directory, query.get('dir', ''))
         fileobject = FileObject(os.path.join(path, query.get('filename', '')), site=self)
 
         if request.GET:
@@ -469,7 +466,7 @@ def detail(self, request):
         """
         from filebrowser.forms import ChangeForm
         query = request.GET
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = '%s' % os.path.join(self.directory, query.get('dir', ''))
         fileobject = FileObject(os.path.join(path, query.get('filename', '')), site=self)
 
         if request.method == 'POST':
@@ -510,10 +507,10 @@ def detail(self, request):
             'form': form,
             'fileobject': fileobject,
             'query': query,
-            'title': u'%s' % fileobject.filename,
+            'title': fileobject.filename,
             'settings_var': get_settings_var(directory=self.directory),
             'breadcrumbs': get_breadcrumbs(query, query.get('dir', '')),
-            'breadcrumbs_title': u'%s' % fileobject.filename,
+            'breadcrumbs_title': fileobject.filename,
             'filebrowser_site': self
         })
 
@@ -523,7 +520,7 @@ def version(self, request):
         This just exists in order to select a version with a filebrowser–popup.
         """
         query = request.GET
-        path = u'%s' % os.path.join(self.directory, query.get('dir', ''))
+        path = os.path.join(self.directory, query.get('dir', ''))
         fileobject = FileObject(os.path.join(path, query.get('filename', '')), site=self)
 
         request.current_app = self.name
@@ -583,14 +580,11 @@ def _upload_file(self, request):
             uploadedfile = handle_file_upload(path, filedata, site=self)
 
             if file_already_exists and OVERWRITE_EXISTING:
-                old_file = smart_str(file_path)
-                new_file = smart_str(uploadedfile)
-                self.storage.move(new_file, old_file, allow_overwrite=True)
-                f = FileObject(smart_str(old_file), site=self)
+                self.storage.move(uploadedfile, file_path, allow_overwrite=True)
+                f = FileObject(file_path, site=self)
             else:
-                file_name = smart_str(uploadedfile)
-                filedata.name = os.path.relpath(file_name, path)
-                f = FileObject(smart_str(file_name), site=self)
+                filedata.name = os.path.relpath(uploadedfile, path)
+                f = FileObject(uploadedfile, site=self)
 
             # set permissions
             if DEFAULT_PERMISSIONS is not None:
diff --git a/filebrowser/storage.py b/filebrowser/storage.py
index 8c03fec3d..084a126c9 100644
--- a/filebrowser/storage.py
+++ b/filebrowser/storage.py
@@ -1,15 +1,12 @@
-# coding: utf-8
-
 import os
 import shutil
 
 from django.core.files.move import file_move_safe
-from django.utils.encoding import smart_str
 from filebrowser.base import FileObject
 from filebrowser.settings import DEFAULT_PERMISSIONS
 
 
-class StorageMixin(object):
+class StorageMixin:
     """
     Adds some useful methods to the Storage class.
     """
@@ -71,7 +68,7 @@ def rmtree(self, name):
         shutil.rmtree(self.path(name))
 
     def setpermission(self, name):
-        full_path = FileObject(smart_str(name), site=self).path_full
+        full_path = FileObject(name, site=self).path_full
         os.chmod(full_path, DEFAULT_PERMISSIONS)
 
 
diff --git a/filebrowser/templatetags/fb_csrf.py b/filebrowser/templatetags/fb_csrf.py
index 55e684ed7..42fe39cac 100644
--- a/filebrowser/templatetags/fb_csrf.py
+++ b/filebrowser/templatetags/fb_csrf.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from django.template import Library, Node
 from django.utils.safestring import mark_safe
 
@@ -12,9 +10,9 @@ def render(self, context):
         csrf_token = context.get('csrf_token', None)
         if csrf_token:
             if csrf_token == 'NOTPROVIDED':
-                return mark_safe(u"")
+                return ""
             else:
-                return mark_safe(u"<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='%s' /></div>" % (csrf_token))
+                return mark_safe("<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='%s' /></div>" % (csrf_token))
         else:
             # It's very probable that the token is missing because of
             # misconfiguration, so we raise a warning
@@ -22,7 +20,7 @@ def render(self, context):
             if settings.DEBUG:
                 import warnings
                 warnings.warn("A {% csrf_token %} was used in a template, but the context did not provide the value. This is usually caused by not using RequestContext.")
-            return u''
+            return ''
 
 
 def fb_csrf_token(parser, token):
diff --git a/filebrowser/templatetags/fb_pagination.py b/filebrowser/templatetags/fb_pagination.py
index 771686800..a03d0b288 100644
--- a/filebrowser/templatetags/fb_pagination.py
+++ b/filebrowser/templatetags/fb_pagination.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from django.template import Library
 
 
diff --git a/filebrowser/templatetags/fb_tags.py b/filebrowser/templatetags/fb_tags.py
index 1aa76f574..5691b489d 100644
--- a/filebrowser/templatetags/fb_tags.py
+++ b/filebrowser/templatetags/fb_tags.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from urllib.parse import quote as urlquote
 
 from django import template
@@ -61,7 +59,7 @@ def get_query_string(p, new_params=None, remove=None):
             del p[k]
         elif v is not None:
             p[k] = v
-    return '?' + '&'.join([u'%s=%s' % (urlquote(k), urlquote(v)) for k, v in p.items()])
+    return '?' + '&'.join(['%s=%s' % (urlquote(k), urlquote(v)) for k, v in p.items()])
 
 
 def string_to_dict(string):
diff --git a/filebrowser/templatetags/fb_versions.py b/filebrowser/templatetags/fb_versions.py
index 79478d605..d9a6929c6 100644
--- a/filebrowser/templatetags/fb_versions.py
+++ b/filebrowser/templatetags/fb_versions.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from django.conf import settings
 from django.core.files import File
 from django.template import Library, Node, Variable, VariableDoesNotExist, TemplateSyntaxError
diff --git a/filebrowser/utils.py b/filebrowser/utils.py
index 7c491d5b5..8594b86e9 100644
--- a/filebrowser/utils.py
+++ b/filebrowser/utils.py
@@ -1,12 +1,8 @@
-# coding: utf-8
-
 import math
 import os
 import re
 import unicodedata
 
-import six
-
 from django.utils.module_loading import import_string
 from filebrowser.settings import (CONVERT_FILENAME, NORMALIZE_FILENAME,
                                   STRICT_PIL, VERSION_PROCESSORS)
@@ -29,7 +25,7 @@ def convert_filename(value):
         chunks = value.split(os.extsep)
         normalized = []
         for v in chunks:
-            v = unicodedata.normalize('NFKD', six.text_type(v)).encode('ascii', 'ignore').decode('ascii')
+            v = unicodedata.normalize('NFKD', str(v)).encode('ascii', 'ignore').decode('ascii')
             v = re.sub(r'[^\w\s-]', '', v).strip()
             normalized.append(v)
 
diff --git a/requirements.txt b/requirements.txt
index ce7c767b6..423c2549b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
 django-grappelli>=3.0,<3.1
 pillow
-six
diff --git a/setup.py b/setup.py
index e79587cca..6e4d66f19 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,5 @@ def read(fname):
     install_requires=[
         'django-grappelli>=3.0,<3.1',
         'pillow',
-        'six',
     ],
 )
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 9b6b24acb..e3bf4a58e 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,8 +1,6 @@
 Django>=4.0,<4.1
 django-grappelli>=3.0,<3.1
 funcsigs==1.0.2
-mock==4.0.3
 pbr==5.8.0
 Pillow==9.3.0
-six==1.16.0
 wheel==0.37.1
diff --git a/tests/test_base.py b/tests/test_base.py
index 04fd8da13..74ab2f072 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -1,16 +1,14 @@
-# coding: utf-8
-
 import ntpath
 import os
 import posixpath
 import shutil
+from unittest.mock import patch
 
 from filebrowser.base import FileListing, FileObject
 from filebrowser.settings import VERSIONS
 from filebrowser.sites import site
 
-from mock import patch
-from tests import FilebrowserTestCase as TestCase
+from . import FilebrowserTestCase as TestCase
 
 
 class FileObjectPathTests(TestCase):
@@ -70,7 +68,7 @@ def test_posix_paths(self):
     @patch('filebrowser.namers.VERSION_NAMER', 'filebrowser.namers.OptionsNamer')
     def test_unicode_options_namer_version(self):
         path_unicode = os.path.join(self.FOLDER_PATH, '測試文件.jpg')
-        expected = u'測試文件_large--680x0.jpg'
+        expected = '測試文件_large--680x0.jpg'
 
         shutil.copy(self.STATIC_IMG_PATH, path_unicode)
         f = FileObject(path_unicode, site=site)
@@ -394,9 +392,9 @@ def test_listing(self):
         """
 
         self.assertEqual(self.F_LISTING_IMAGE.listing(), [])
-        self.assertEqual(list(self.F_LISTING_FOLDER.listing()), [u'folder', u'testimage.jpg'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_total()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_filtered()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder'])
+        self.assertEqual(list(self.F_LISTING_FOLDER.listing()), ['folder', 'testimage.jpg'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_total()), ['_test/uploads/testimage.jpg', '_test/uploads/folder'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_filtered()), ['_test/uploads/testimage.jpg', '_test/uploads/folder'])
         self.assertEqual(self.F_LISTING_FOLDER.results_listing_total(), 2)
         self.assertEqual(self.F_LISTING_FOLDER.results_listing_filtered(), 2)
 
@@ -412,9 +410,9 @@ def test_listing_filtered(self):
         """
 
         self.assertEqual(self.F_LISTING_IMAGE.listing(), [])
-        self.assertEqual(list(self.F_LISTING_FOLDER.listing()), [u'folder', u'testimage.jpg'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_total()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_filtered()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder'])
+        self.assertEqual(list(self.F_LISTING_FOLDER.listing()), ['folder', 'testimage.jpg'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_total()), ['_test/uploads/testimage.jpg', '_test/uploads/folder'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_listing_filtered()), ['_test/uploads/testimage.jpg', '_test/uploads/folder'])
         self.assertEqual(self.F_LISTING_FOLDER.results_listing_total(), 2)
         self.assertEqual(self.F_LISTING_FOLDER.results_listing_filtered(), 2)
 
@@ -430,9 +428,9 @@ def test_walk(self):
         """
 
         self.assertEqual(self.F_LISTING_IMAGE.walk(), [])
-        self.assertEqual(list(self.F_LISTING_FOLDER.walk()), [u'folder/subfolder/testimage.jpg', u'folder/subfolder', u'folder', u'testimage.jpg'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_walk_total()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder', u'_test/uploads/folder/subfolder', u'_test/uploads/folder/subfolder/testimage.jpg'])
-        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_walk_filtered()), [u'_test/uploads/testimage.jpg', u'_test/uploads/folder', u'_test/uploads/folder/subfolder', u'_test/uploads/folder/subfolder/testimage.jpg'])
+        self.assertEqual(list(self.F_LISTING_FOLDER.walk()), ['folder/subfolder/testimage.jpg', 'folder/subfolder', 'folder', 'testimage.jpg'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_walk_total()), ['_test/uploads/testimage.jpg', '_test/uploads/folder', '_test/uploads/folder/subfolder', '_test/uploads/folder/subfolder/testimage.jpg'])
+        self.assertEqual(list(f.path for f in self.F_LISTING_FOLDER.files_walk_filtered()), ['_test/uploads/testimage.jpg', '_test/uploads/folder', '_test/uploads/folder/subfolder', '_test/uploads/folder/subfolder/testimage.jpg'])
         self.assertEqual(self.F_LISTING_FOLDER.results_walk_total(), 4)
         self.assertEqual(self.F_LISTING_FOLDER.results_walk_filtered(), 4)
 
diff --git a/tests/test_commands.py b/tests/test_commands.py
index fef0f37e9..1e358697f 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -1,15 +1,12 @@
-# coding: utf-8
-
 import os
 import shutil
 import sys
-
-from six import StringIO
+from io import StringIO
 
 from django.conf import settings
 from django.core.management import call_command
 from filebrowser.settings import DIRECTORY
-from tests import FilebrowserTestCase as TestCase
+from . import FilebrowserTestCase as TestCase
 
 
 class VersionGenerateCommandTests(TestCase):
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
index 48d4219ae..ad996722e 100644
--- a/tests/test_decorators.py
+++ b/tests/test_decorators.py
@@ -1,10 +1,8 @@
-# coding: utf-8
-
 import shutil
 
 from filebrowser.decorators import get_path, get_file
 from filebrowser.sites import site
-from tests import FilebrowserTestCase as TestCase
+from . import FilebrowserTestCase as TestCase
 
 
 class GetPathTests(TestCase):
diff --git a/tests/test_namers.py b/tests/test_namers.py
index 79cc4d1e2..2e2d9f7b7 100644
--- a/tests/test_namers.py
+++ b/tests/test_namers.py
@@ -1,13 +1,9 @@
-# coding: utf-8
-
 import shutil
-
-from mock import patch
-
-from filebrowser.settings import VERSIONS
-from tests import FilebrowserTestCase as TestCase
+from unittest.mock import patch
 
 from filebrowser.namers import OptionsNamer
+from filebrowser.settings import VERSIONS
+from . import FilebrowserTestCase as TestCase
 
 
 class BaseNamerTests(TestCase):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index dcf997dcf..3597985a6 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # FIXME
 # These tests are designed to run against production, not testing. They
 # would be better suited for the Django Check Framework.
diff --git a/tests/test_sites.py b/tests/test_sites.py
index 3dc39b19c..b95865a14 100644
--- a/tests/test_sites.py
+++ b/tests/test_sites.py
@@ -1,20 +1,15 @@
-# coding: utf-8
-from __future__ import with_statement
 import os
 import json
 import shutil
+from unittest.mock import patch
 
 from django.urls import reverse
-try:
-    from django.utils.six.moves.urllib.parse import urlencode
-except:
-    from django.utils.http import urlencode
-from mock import patch
+from django.utils.http import urlencode
 
 from filebrowser.settings import VERSIONS, DEFAULT_PERMISSIONS
 from filebrowser.base import FileObject
 from filebrowser.sites import site
-from tests import FilebrowserTestCase as TestCase
+from . import FilebrowserTestCase as TestCase
 
 
 class BrowseViewTests(TestCase):
@@ -34,7 +29,7 @@ def test_get(self):
 
     def test_filter(self):
         shutil.copy(self.STATIC_IMG_PATH, self.FOLDER_PATH)
-        self.assertEqual(site.storage.listdir(self.F_FOLDER.path), (['subfolder'], [u'testimage.jpg']))
+        self.assertEqual(site.storage.listdir(self.F_FOLDER.path), (['subfolder'], ['testimage.jpg']))
 
         response = self.client.get(self.url + "?dir=folder")
         self.assertEqual(len(response.context['page'].object_list), 2)
@@ -166,19 +161,19 @@ def test_do_temp_upload(self):
     @patch('filebrowser.sites.OVERWRITE_EXISTING', True)
     def test_overwrite_existing_true(self):
         shutil.copy(self.STATIC_IMG_PATH, self.SUBFOLDER_PATH)
-        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'testimage.jpg']))
+        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['testimage.jpg']))
 
         url = '?'.join([self.url, urlencode({'folder': self.F_SUBFOLDER.path_relative_directory})])
 
         with open(self.STATIC_IMG_PATH, "rb") as f:
             self.client.post(url, data={'qqfile': 'testimage.jpg', 'file': f}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
 
-        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'testimage.jpg']))
+        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['testimage.jpg']))
 
     @patch('filebrowser.sites.OVERWRITE_EXISTING', False)
     def test_overwrite_existing_false(self):
         shutil.copy(self.STATIC_IMG_PATH, self.SUBFOLDER_PATH)
-        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'testimage.jpg']))
+        self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['testimage.jpg']))
 
         url = '?'.join([self.url, urlencode({'folder': self.F_SUBFOLDER.path_relative_directory})])
 
@@ -192,28 +187,28 @@ def test_overwrite_existing_false(self):
     def test_convert_false_normalize_false(self):
         with open(self.STATIC_IMG_BAD_NAME_PATH, "rb") as f:
             self.client.post(self.url_bad_name, data={'qqfile': 'TEST_IMAGE_000.jpg', 'file': f}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'TEST_IMAGE_000.jpg']))
+            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['TEST_IMAGE_000.jpg']))
 
     @patch('filebrowser.utils.CONVERT_FILENAME', True)
     @patch('filebrowser.utils.NORMALIZE_FILENAME', False)
     def test_convert_true_normalize_false(self):
         with open(self.STATIC_IMG_BAD_NAME_PATH, "rb") as f:
             self.client.post(self.url_bad_name, data={'qqfile': 'TEST_IMAGE_000.jpg', 'file': f}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'test_image_000.jpg']))
+            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['test_image_000.jpg']))
 
     @patch('filebrowser.utils.CONVERT_FILENAME', False)
     @patch('filebrowser.utils.NORMALIZE_FILENAME', True)
     def test_convert_false_normalize_true(self):
         with open(self.STATIC_IMG_BAD_NAME_PATH, "rb") as f:
             self.client.post(self.url_bad_name, data={'qqfile': 'TEST_IMAGE_000.jpg', 'file': f}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'TEST_IMAGE_000.jpg']))
+            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['TEST_IMAGE_000.jpg']))
 
     @patch('filebrowser.utils.CONVERT_FILENAME', True)
     @patch('filebrowser.utils.NORMALIZE_FILENAME', True)
     def test_convert_true_normalize_true(self):
         with open(self.STATIC_IMG_BAD_NAME_PATH, "rb") as f:
             self.client.post(self.url_bad_name, data={'qqfile': 'TEST_IMAGE_000.jpg', 'file': f}, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
-            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], [u'test_image_000.jpg']))
+            self.assertEqual(site.storage.listdir(self.F_SUBFOLDER.path), ([], ['test_image_000.jpg']))
 
 
 class DetailViewTests(TestCase):
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py
index f62ed414b..17fc0a160 100644
--- a/tests/test_templatetags.py
+++ b/tests/test_templatetags.py
@@ -1,4 +1,3 @@
-# coding: utf-8
 from django.test import TestCase
 from django.http import QueryDict
 
diff --git a/tests/test_versions.py b/tests/test_versions.py
index 3b32ff839..00f3716ae 100644
--- a/tests/test_versions.py
+++ b/tests/test_versions.py
@@ -1,15 +1,14 @@
-# coding: utf-8
 import os
 import shutil
+from unittest.mock import patch
 
 from django.conf import settings
 from django.template import Context, Template, TemplateSyntaxError
-from mock import patch
 
-from tests import FilebrowserTestCase as TestCase
 from filebrowser.settings import STRICT_PIL
 from filebrowser import utils
 from filebrowser.utils import scale_and_crop, process_image
+from . import FilebrowserTestCase as TestCase
 
 if STRICT_PIL:
     from PIL import Image