diff --git a/avatar/templatetags/avatar_tags.py b/avatar/templatetags/avatar_tags.py
index 7a727d1..e103944 100644
--- a/avatar/templatetags/avatar_tags.py
+++ b/avatar/templatetags/avatar_tags.py
@@ -98,6 +98,7 @@ def render_avatar(avatar, size=AVATAR_DEFAULT_SIZE):
         avatar.avatar_url(size), str(avatar), size, size)
 
 
+@register.tag
 def primary_avatar_object(parser, token):
     split = token.split_contents()
     if len(split) == 4:
@@ -120,5 +121,3 @@ class UsersAvatarObjectNode(template.Node):
         else:
             context[key] = None
         return six.text_type()
-
-register.tag('primary_avatar_object', primary_avatar_object)
diff --git a/avatar/views.py b/avatar/views.py
index afc6f05..5a2d0b0 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -1,9 +1,7 @@
-from django.core.files.base import ContentFile
-from django.http import HttpResponse, Http404
-from django.shortcuts import get_object_or_404, render, redirect
+from django.http import Http404
+from django.shortcuts import render, redirect
 from django.utils import six
 from django.utils.translation import ugettext as _
-from django.views.decorators.csrf import csrf_exempt
 
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required