diff --git a/apps/common/__init__.py b/apps/common/__init__.py
index 9dcd406a4f..928a5d36b7 100644
--- a/apps/common/__init__.py
+++ b/apps/common/__init__.py
@@ -5,7 +5,6 @@ import tempfile
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth import models as auth_models
 from django.contrib.auth.management import create_superuser
-from django.db.models import signals
 from django.dispatch import receiver
 from django.db.models.signals import post_syncdb
 
diff --git a/apps/common/widgets.py b/apps/common/widgets.py
index bfedfaa776..9ec76a40a6 100644
--- a/apps/common/widgets.py
+++ b/apps/common/widgets.py
@@ -120,7 +120,8 @@ class ScrollableCheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple):
     exceds the height of the div
     '''
     def render(self, name, value, attrs=None, choices=()):
-        if value is None: value = []
+        if value is None:
+            value = []
         has_id = attrs and 'id' in attrs
         final_attrs = self.build_attrs(attrs, name=name)
         output = [u'<ul class="undecorated_list" style="margin-left: 5px; margin-top: 3px; margin-bottom: 3px;">']
diff --git a/apps/django_gpg/__init__.py b/apps/django_gpg/__init__.py
index 558dae9371..6448d825da 100644
--- a/apps/django_gpg/__init__.py
+++ b/apps/django_gpg/__init__.py
@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import (register_links, register_top_menu,
-    register_model_list_columns, register_multi_item_links,
-    register_sidebar_template)
-from main.api import register_diagnostic, register_maintenance_links
+from navigation.api import register_links
 from project_setup.api import register_setup
 from hkp import Key as KeyServerKey
 
diff --git a/apps/django_gpg/api.py b/apps/django_gpg/api.py
index 329ffe612e..5aea19746f 100644
--- a/apps/django_gpg/api.py
+++ b/apps/django_gpg/api.py
@@ -1,8 +1,5 @@
 from __future__ import absolute_import
 
-import types
-
-from pickle import dumps
 import logging
 import tempfile
 import os
diff --git a/apps/django_gpg/forms.py b/apps/django_gpg/forms.py
index 619035fd5d..9a9514fdb3 100644
--- a/apps/django_gpg/forms.py
+++ b/apps/django_gpg/forms.py
@@ -1,9 +1,6 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
-from django.core.urlresolvers import reverse
-from django.utils.safestring import mark_safe
-from django.conf import settings
 
 
 class KeySearchForm(forms.Form):
diff --git a/apps/django_gpg/views.py b/apps/django_gpg/views.py
index 60d400b018..ab49bbcfa9 100644
--- a/apps/django_gpg/views.py
+++ b/apps/django_gpg/views.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
 
-from datetime import datetime
 import logging
 
 from django.utils.translation import ugettext_lazy as _
@@ -14,8 +13,7 @@ from django.conf import settings
 from django.template.defaultfilters import force_escape
 
 from permissions.models import Permission
-from common.utils import pretty_size, parse_range, urlquote, \
-    return_diff, encapsulate
+from common.utils import (urlquote, encapsulate)
    
 from .api import Key, SIGNATURE_STATES
 from .runtime import gpg
diff --git a/apps/document_signatures/__init__.py b/apps/document_signatures/__init__.py
index cd9a120cc3..2311a2f1b2 100644
--- a/apps/document_signatures/__init__.py
+++ b/apps/document_signatures/__init__.py
@@ -72,7 +72,7 @@ def document_post_save_hook(instance):
     if not instance.pk:
         document_signature, created = DocumentVersionSignature.objects.get_or_create(
             document_version=instance.latest_version,
-        )        
+        )   
         #DocumentVersionSignature.objects.update_signed_state(instance.document)
 
 #@receiver(post_save, dispatch_uid='check_document_signature_state', sender=DocumentVersion)
diff --git a/apps/document_signatures/managers.py b/apps/document_signatures/managers.py
index 915fba4644..ff4ed05e9c 100644
--- a/apps/document_signatures/managers.py
+++ b/apps/document_signatures/managers.py
@@ -13,12 +13,12 @@ class DocumentVersionSignatureManager(models.Manager):
         document_signature, created = self.model.objects.get_or_create(
             document_version=document.latest_version,
         )
-       
+
         return document_signature
-    
+
     def add_detached_signature(self, document, detached_signature):
         document_signature = self.get_document_signature(document)
-        
+
         if document_signature.has_embedded_signature:
             raise Exception('document already has an embedded signature')
         else:
@@ -27,13 +27,13 @@ class DocumentVersionSignatureManager(models.Manager):
                 document_signature.delete_detached_signature()
                 document_signature.signature_file = None
                 document_signature.save()
-                
+
             document_signature.signature_file = detached_signature
             document_signature.save()
 
     def has_detached_signature(self, document):
         document_signature = self.get_document_signature(document)
-                    
+
         if document_signature.signature_file:
             return True
         else:
@@ -48,7 +48,7 @@ class DocumentVersionSignatureManager(models.Manager):
 
     def detached_signature(self, document):
         document_signature = self.get_document_signature(document)
-        
+
         return document_signature.signature_file.storage.open(document_signature.signature_file.path)
 
     def verify_signature(self, document):
diff --git a/apps/document_signatures/models.py b/apps/document_signatures/models.py
index 2c15523574..4b71af2f71 100644
--- a/apps/document_signatures/models.py
+++ b/apps/document_signatures/models.py
@@ -28,7 +28,7 @@ class DocumentVersionSignature(models.Model):
 
     def save(self, *args, **kwargs):
         if not self.pk:
-            self.has_embedded_signature = gpg.has_embedded_signature(self.document_version.open(raw=True))            
+            self.has_embedded_signature = gpg.has_embedded_signature(self.document_version.open(raw=True))
         super(DocumentVersionSignature, self).save(*args, **kwargs)
 
     class Meta:
diff --git a/apps/document_signatures/views.py b/apps/document_signatures/views.py
index fc33c87a2a..024f59ffb4 100644
--- a/apps/document_signatures/views.py
+++ b/apps/document_signatures/views.py
@@ -117,7 +117,7 @@ def document_signature_download(request, document_pk):
     try:
         Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_DOWNLOAD])
     except PermissionDenied:
-        AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DOWNLOAD, request.user, document)    
+        AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DOWNLOAD, request.user, document)
 
     try:
         if DocumentVersionSignature.objects.has_detached_signature(document):
diff --git a/apps/folders/models.py b/apps/folders/models.py
index 20c2eda7a7..c032780241 100644
--- a/apps/folders/models.py
+++ b/apps/folders/models.py
@@ -23,7 +23,7 @@ class Folder(models.Model):
     @models.permalink
     def get_absolute_url(self):
         return ('folder_view', [self.pk])
-        
+
     @property
     def documents(self):
         return [folder_document.document for folder_document in self.folderdocument_set.all()]
diff --git a/apps/folders/views.py b/apps/folders/views.py
index de1dcc4ca4..b604f00d8b 100644
--- a/apps/folders/views.py
+++ b/apps/folders/views.py
@@ -7,7 +7,6 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib import messages
-from django.views.generic.list_detail import object_list
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 
@@ -19,7 +18,7 @@ from common.utils import encapsulate
 from acls.models import AccessEntry
 from acls.views import acl_list_for
 
-from .models import Folder, FolderDocument
+from .models import Folder
 from .forms import FolderForm, FolderListForm
 from .permissions import (PERMISSION_FOLDER_CREATE,
     PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE,