diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py
index 7fad317e853b..e81b62214067 100644
--- a/awx/api/views/__init__.py
+++ b/awx/api/views/__init__.py
@@ -18,7 +18,7 @@
 # Django
 from django.conf import settings
 from django.core.exceptions import FieldError, ObjectDoesNotExist
-from django.db.models import Q, Count
+from django.db.models import Q
 from django.db import IntegrityError, transaction, connection
 from django.shortcuts import get_object_or_404
 from django.utils.encoding import smart_text
diff --git a/awx/api/views/organization.py b/awx/api/views/organization.py
index f2870214a004..3c46ad3cca3f 100644
--- a/awx/api/views/organization.py
+++ b/awx/api/views/organization.py
@@ -134,25 +134,6 @@ class OrganizationInventoriesList(SubListAPIView):
     relationship = 'inventories'
 
 
-class BaseUsersList(SubListCreateAttachDetachAPIView):
-    def post(self, request, *args, **kwargs):
-        ret = super(BaseUsersList, self).post( request, *args, **kwargs)
-        if ret.status_code != 201:
-            return ret
-        try:
-            if ret.data is not None and request.data.get('is_system_auditor', False):
-                # This is a faux-field that just maps to checking the system
-                # auditor role member list.. unfortunately this means we can't
-                # set it on creation, and thus needs to be set here.
-                user = User.objects.get(id=ret.data['id'])
-                user.is_system_auditor = request.data['is_system_auditor']
-                ret.data['is_system_auditor'] = request.data['is_system_auditor']
-        except AttributeError as exc:
-            print(exc)
-            pass
-        return ret
-
-
 class OrganizationUsersList(BaseUsersList):
 
     model = User