diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py
index 27ccf7790f..e67b898bcd 100644
--- a/awx/main/models/ad_hoc_commands.py
+++ b/awx/main/models/ad_hoc_commands.py
@@ -9,7 +9,6 @@ import logging
 # Django
 from django.conf import settings
 from django.db import models
-from django.db.models import Q
 from django.utils.text import Truncator
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
@@ -19,11 +18,9 @@ from django.core.urlresolvers import reverse
 from jsonfield import JSONField
 
 # AWX
-from awx.main.constants import CLOUD_PROVIDERS
 from awx.main.models.base import * # noqa
 from awx.main.models.unified_jobs import * # noqa
-from awx.main.utils import decrypt_field, ignore_inventory_computed_fields
-from awx.main.utils import emit_websocket_notification
+from awx.main.utils import decrypt_field
 
 logger = logging.getLogger('awx.main.models.ad_hoc_commands')
 
diff --git a/awx/main/tests/ad_hoc.py b/awx/main/tests/ad_hoc.py
index c0071f4f2e..2061627df1 100644
--- a/awx/main/tests/ad_hoc.py
+++ b/awx/main/tests/ad_hoc.py
@@ -2,19 +2,14 @@
 # All Rights Reserved.
 
 # Python
-from distutils.version import StrictVersion as Version
 import glob
-import json
 import os
-import shutil
 import subprocess
 import tempfile
-import unittest
 
 # Django
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.utils.timezone import now
 
 # Django-CRUM
 from crum import impersonate
@@ -22,7 +17,7 @@ from crum import impersonate
 # AWX
 from awx.main.models import * # noqa
 from awx.main.tests.base import BaseJobExecutionTest
-from awx.main.tests.tasks import TEST_SSH_KEY_DATA, TEST_SSH_KEY_DATA_LOCKED, TEST_SSH_CERT_KEY, TEST_SSH_KEY_DATA_UNLOCK
+from awx.main.tests.tasks import TEST_SSH_KEY_DATA, TEST_SSH_KEY_DATA_LOCKED, TEST_SSH_KEY_DATA_UNLOCK
 
 __all__ = ['RunAdHocCommandTest', 'AdHocCommandApiTest']