diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py
index 9087c787bd..68ffac2951 100644
--- a/mayan/apps/documents/views/document_views.py
+++ b/mayan/apps/documents/views/document_views.py
@@ -147,7 +147,6 @@ class DocumentDocumentTypeEditView(MultipleObjectFormActionView):
         return result
 
     def get_form_extra_kwargs(self):
-        queryset = self.get_queryset()
         result = {
             'user': self.request.user
         }
diff --git a/mayan/apps/folders/forms.py b/mayan/apps/folders/forms.py
index d0f384726a..47a8021492 100644
--- a/mayan/apps/folders/forms.py
+++ b/mayan/apps/folders/forms.py
@@ -8,7 +8,6 @@ from django.utils.translation import ugettext_lazy as _
 from acls.models import AccessControlList
 
 from .models import Folder
-from .permissions import permission_folder_view
 
 logger = logging.getLogger(__name__)
 
diff --git a/mayan/apps/folders/links.py b/mayan/apps/folders/links.py
index 2d9b9c4797..1eeea20a58 100644
--- a/mayan/apps/folders/links.py
+++ b/mayan/apps/folders/links.py
@@ -19,8 +19,9 @@ link_document_folder_list = Link(
     args='resolved_object.pk'
 )
 link_document_folder_remove = Link(
-    args='resolved_object.pk', text=_('Remove from folders'),
-    view='folders:document_folder_remove'
+    args='resolved_object.pk',
+    permissions=(permission_folder_remove_document,),
+    text=_('Remove from folders'), view='folders:document_folder_remove'
 )
 link_folder_add_document = Link(
     permissions=(permission_folder_add_document,), text=_('Add to a folders'),
diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py
index 4ea3ac4290..2f470e73e3 100644
--- a/mayan/apps/folders/views.py
+++ b/mayan/apps/folders/views.py
@@ -2,12 +2,9 @@ from __future__ import absolute_import, unicode_literals
 
 import logging
 
-from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse, reverse_lazy
-from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render_to_response
-from django.template import RequestContext
+from django.core.urlresolvers import reverse_lazy
+from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from acls.models import AccessControlList