diff --git a/mayan/apps/common/settings.py b/mayan/apps/common/settings.py
index a1a16e656f..8edf6c8512 100644
--- a/mayan/apps/common/settings.py
+++ b/mayan/apps/common/settings.py
@@ -7,26 +7,6 @@ from django.utils.translation import ugettext_lazy as _
 from smart_settings import Namespace
 
 namespace = Namespace(name='common', label=_('Common'))
-setting_temporary_directory = namespace.add_setting(
-    global_name='COMMON_TEMPORARY_DIRECTORY', default=tempfile.gettempdir(),
-    help_text=_(
-        'Temporary directory used site wide to store thumbnails, previews '
-        'and temporary files.'
-    ),
-    is_path=True
-)
-setting_shared_storage = namespace.add_setting(
-    global_name='COMMON_SHARED_STORAGE',
-    default='storage.backends.filebasedstorage.FileBasedStorage',
-    help_text=_('A storage backend that all workers can use to share files.')
-)
-setting_paginate_by = namespace.add_setting(
-    global_name='COMMON_PAGINATE_BY',
-    default=40,
-    help_text=_(
-        'An integer specifying how many objects should be displayed per page.'
-    )
-)
 setting_auto_logging = namespace.add_setting(
     global_name='COMMON_AUTO_LOGGING',
     default=True,
@@ -40,3 +20,23 @@ settings_db_sync_task_delay = namespace.add_setting(
         'propagate.'
     )
 )
+setting_paginate_by = namespace.add_setting(
+    global_name='COMMON_PAGINATE_BY',
+    default=40,
+    help_text=_(
+        'An integer specifying how many objects should be displayed per page.'
+    )
+)
+setting_shared_storage = namespace.add_setting(
+    global_name='COMMON_SHARED_STORAGE',
+    default='storage.backends.filebasedstorage.FileBasedStorage',
+    help_text=_('A storage backend that all workers can use to share files.')
+)
+setting_temporary_directory = namespace.add_setting(
+    global_name='COMMON_TEMPORARY_DIRECTORY', default=tempfile.gettempdir(),
+    help_text=_(
+        'Temporary directory used site wide to store thumbnails, previews '
+        'and temporary files.'
+    ),
+    is_path=True
+)
diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py
index 7e9039b100..a5716a1c65 100644
--- a/mayan/apps/common/tests/test_views.py
+++ b/mayan/apps/common/tests/test_views.py
@@ -7,7 +7,6 @@ from django.core.urlresolvers import clear_url_caches, reverse
 from django.http import HttpResponse
 from django.template import Context, Template
 
-from permissions import Permission
 from permissions.models import Role
 from permissions.tests.literals import TEST_ROLE_LABEL
 from user_management.tests import (
diff --git a/mayan/apps/permissions/serializers.py b/mayan/apps/permissions/serializers.py
index 375818e93a..9cff8afff2 100644
--- a/mayan/apps/permissions/serializers.py
+++ b/mayan/apps/permissions/serializers.py
@@ -29,10 +29,6 @@ class PermissionSerializer(serializers.Serializer):
 
 
 class RoleSerializer(serializers.HyperlinkedModelSerializer):
-    groups = GroupSerializer(many=True)
-
-
-class RoleSerializer(serializers.ModelSerializer):
     groups = GroupSerializer(many=True, read_only=True)
     permissions = PermissionSerializer(many=True, read_only=True)