diff --git a/dpaste/context_processors.py b/dpaste/context_processors.py
deleted file mode 100644
index f4dbefa..0000000
--- a/dpaste/context_processors.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.conf import settings
-
-def dpaste_globals(request):
-    return {
-        'site_name': getattr(settings, 'DPASTE_SITE_NAME', 'dpaste.de'),
-        'jquery_url': getattr(settings, 'DPASTE_JQUERY_URL',
-            'https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.js'),
-    }
diff --git a/dpaste/forms.py b/dpaste/forms.py
index f509174..e240b0f 100644
--- a/dpaste/forms.py
+++ b/dpaste/forms.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import datetime
 
 from django import forms
diff --git a/dpaste/highlight.py b/dpaste/highlight.py
index 79981b9..1b7f44f 100644
--- a/dpaste/highlight.py
+++ b/dpaste/highlight.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf import settings
 from django.template.defaultfilters import escape
 from django.utils.translation import ugettext_lazy as _
diff --git a/dpaste/models.py b/dpaste/models.py
index 87d04b2..2b7ff62 100644
--- a/dpaste/models.py
+++ b/dpaste/models.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from random import SystemRandom
 
 from django.conf import settings
diff --git a/dpaste/templates/dpaste/snippet_details.html b/dpaste/templates/dpaste/snippet_details.html
index 4910875..abf928b 100644
--- a/dpaste/templates/dpaste/snippet_details.html
+++ b/dpaste/templates/dpaste/snippet_details.html
@@ -1,7 +1,6 @@
 {% extends "dpaste/base.html" %}
 
 {% load i18n %}
-{% load dpaste_tags %}
 
 {% block title %}{% trans "Snippet" %} #{{ snippet.pk }}{% endblock %}
 {% block headline_wrapper %}
@@ -39,9 +38,7 @@
                 {% trans "One-Time snippet" %}
             {% endif %}
         </span>
-        {% if snippet.pk|in_list:request.session.snippet_list %}
         <a class="btn" href="{% url "snippet_delete" snippet.secret_id %}" onclick="return confirm('{% trans "Really delete this snippet?" %}');"><i class="icon-trash"></i> {% trans "Delete Now" %}</a>
-        {% endif %}
         {% if snippet.parent %}
         <a class="btn snippet-diff-trigger" href="#snippet-diff"><i class="icon-search"></i> {% trans "Compare this Answer" %}</a>
         {% endif %}
diff --git a/dpaste/templates/dpaste/snippet_list.html b/dpaste/templates/dpaste/snippet_list.html
index d11d876..3fef0e7 100644
--- a/dpaste/templates/dpaste/snippet_list.html
+++ b/dpaste/templates/dpaste/snippet_list.html
@@ -1,7 +1,6 @@
 {% extends "dpaste/base.html" %}
 
 {% load i18n %}
-{% load dpaste_tags %}
 
 {% block title %}Snippet History{% endblock %}
 {% block headline %}Snippet History{% endblock %}
diff --git a/dpaste/templatetags/__init__.py b/dpaste/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/dpaste/templatetags/dpaste_tags.py b/dpaste/templatetags/dpaste_tags.py
deleted file mode 100644
index ba2270f..0000000
--- a/dpaste/templatetags/dpaste_tags.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from django.template import Library
-
-register = Library()
-
-@register.filter
-def in_list(value, arg):
-    return value in arg
-
-
diff --git a/dpaste/tests/test_api.py b/dpaste/tests/test_api.py
index f47ffa9..a4b6f0e 100644
--- a/dpaste/tests/test_api.py
+++ b/dpaste/tests/test_api.py
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse
 from django.test import TestCase
diff --git a/dpaste/tests/test_snippet.py b/dpaste/tests/test_snippet.py
index 118ef87..bbb3858 100644
--- a/dpaste/tests/test_snippet.py
+++ b/dpaste/tests/test_snippet.py
@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+from __future__ import unicode_literals
 
 from datetime import timedelta
 
diff --git a/dpaste/urls/dpaste.py b/dpaste/urls/dpaste.py
index ea0ddb9..8f6af38 100644
--- a/dpaste/urls/dpaste.py
+++ b/dpaste/urls/dpaste.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf import settings
 from django.conf.urls import url
 
diff --git a/dpaste/urls/dpaste_api.py b/dpaste/urls/dpaste_api.py
index cea3ee6..45ed101 100644
--- a/dpaste/urls/dpaste_api.py
+++ b/dpaste/urls/dpaste_api.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf.urls import url
 
 from ..views import APIView
diff --git a/dpaste/views.py b/dpaste/views.py
index a12f297..3b1ebf2 100644
--- a/dpaste/views.py
+++ b/dpaste/views.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import datetime
 import difflib
 import json
diff --git a/runtests.py b/runtests.py
index 30afb39..1c33db3 100755
--- a/runtests.py
+++ b/runtests.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+from __future__ import unicode_literals
+
 import sys
 
 from django.conf import settings
@@ -26,7 +28,6 @@ SETTINGS = {
                     'django.template.context_processors.debug',
                     'django.template.context_processors.request',
                     'django.template.context_processors.i18n',
-                    'dpaste.context_processors.dpaste_globals',
                 ],
             },
         },