diff --git a/openstack_dashboard/api/base.py b/openstack_dashboard/api/base.py
index 2f8a1c6c5b..5a1bed7f85 100644
--- a/openstack_dashboard/api/base.py
+++ b/openstack_dashboard/api/base.py
@@ -16,7 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from collections import Sequence  # noqa
+from collections import Sequence
 import functools
 
 from django.conf import settings
diff --git a/openstack_dashboard/api/cinder.py b/openstack_dashboard/api/cinder.py
index f50df734f4..82f94c79fc 100644
--- a/openstack_dashboard/api/cinder.py
+++ b/openstack_dashboard/api/cinder.py
@@ -31,8 +31,8 @@ from cinderclient.v2.contrib import list_extensions as cinder_list_extensions
 
 from horizon import exceptions
 from horizon.utils import functions as utils
-from horizon.utils.memoized import memoized  # noqa
-from horizon.utils.memoized import memoized_with_request  # noqa
+from horizon.utils.memoized import memoized
+from horizon.utils.memoized import memoized_with_request
 
 from openstack_dashboard.api import base
 from openstack_dashboard.api import nova
diff --git a/openstack_dashboard/api/glance.py b/openstack_dashboard/api/glance.py
index 9efee0460e..86d4971daf 100644
--- a/openstack_dashboard/api/glance.py
+++ b/openstack_dashboard/api/glance.py
@@ -34,7 +34,7 @@ import six
 from six.moves import _thread as thread
 
 from horizon.utils import functions as utils
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 from openstack_dashboard.api import base
 from openstack_dashboard.contrib.developer.profiler import api as profiler
 
diff --git a/openstack_dashboard/api/heat.py b/openstack_dashboard/api/heat.py
index d8417e4a4b..38f554ae21 100644
--- a/openstack_dashboard/api/heat.py
+++ b/openstack_dashboard/api/heat.py
@@ -23,7 +23,7 @@ from heatclient.common import template_utils
 from heatclient.common import utils as heat_utils
 from horizon import exceptions
 from horizon.utils import functions as utils
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 from openstack_dashboard.api import base
 from openstack_dashboard.contrib.developer.profiler import api as profiler
 
diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py
index b97d423417..a3cf2f5514 100644
--- a/openstack_dashboard/api/neutron.py
+++ b/openstack_dashboard/api/neutron.py
@@ -33,7 +33,7 @@ import six
 
 from horizon import exceptions
 from horizon import messages
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 from openstack_dashboard.api import base
 from openstack_dashboard.api import network_base
 from openstack_dashboard.api import nova
diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py
index 5662298504..cfc0cd4616 100644
--- a/openstack_dashboard/api/nova.py
+++ b/openstack_dashboard/api/nova.py
@@ -24,7 +24,7 @@ import collections
 import logging
 
 from django.conf import settings
-from django.utils.functional import cached_property  # noqa
+from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 import six
 
@@ -39,8 +39,8 @@ from novaclient.v2 import servers as nova_servers
 from horizon import conf
 from horizon import exceptions as horizon_exceptions
 from horizon.utils import functions as utils
-from horizon.utils.memoized import memoized  # noqa
-from horizon.utils.memoized import memoized_with_request  # noqa
+from horizon.utils.memoized import memoized
+from horizon.utils.memoized import memoized_with_request
 
 from openstack_dashboard.api import base
 from openstack_dashboard.api import network_base
@@ -114,8 +114,8 @@ class Server(base.APIResourceWrapper):
     # TODO(gabriel): deprecate making a call to Glance as a fallback.
     @property
     def image_name(self):
-        import glanceclient.exc as glance_exceptions  # noqa
-        from openstack_dashboard.api import glance  # noqa
+        import glanceclient.exc as glance_exceptions
+        from openstack_dashboard.api import glance
 
         if not self.image:
             return _("-")
diff --git a/openstack_dashboard/api/rest/__init__.py b/openstack_dashboard/api/rest/__init__.py
index 9e4979c3ec..925cbb098f 100644
--- a/openstack_dashboard/api/rest/__init__.py
+++ b/openstack_dashboard/api/rest/__init__.py
@@ -21,14 +21,27 @@ It does not promise to adhere to the general OpenStack API Guidelines set out
 in https://wiki.openstack.org/wiki/APIChangeGuidelines.
 """
 
-# import REST API modules here
-from . import cinder       # noqa
-from . import config       # noqa
-from . import glance       # noqa
-from . import heat         # noqa
-from . import keystone     # noqa
-from . import network      # noqa
-from . import neutron      # noqa
-from . import nova         # noqa
-from . import policy       # noqa
-from . import swift        # noqa
+from openstack_dashboard.api.rest import cinder
+from openstack_dashboard.api.rest import config
+from openstack_dashboard.api.rest import glance
+from openstack_dashboard.api.rest import heat
+from openstack_dashboard.api.rest import keystone
+from openstack_dashboard.api.rest import network
+from openstack_dashboard.api.rest import neutron
+from openstack_dashboard.api.rest import nova
+from openstack_dashboard.api.rest import policy
+from openstack_dashboard.api.rest import swift
+
+
+__all__ = [
+    'cinder',
+    'config',
+    'glance',
+    'heat',
+    'keystone',
+    'network',
+    'neutron',
+    'nova',
+    'policy',
+    'swift',
+]
diff --git a/openstack_dashboard/api/rest/glance.py b/openstack_dashboard/api/rest/glance.py
index a4475ee783..fca0ec9214 100644
--- a/openstack_dashboard/api/rest/glance.py
+++ b/openstack_dashboard/api/rest/glance.py
@@ -135,7 +135,7 @@ class Images(generic.View):
         an image.
 
         Example GET:
-        http://localhost/api/glance/images?sort_dir=desc&sort_key=name&name=cirros-0.3.2-x86_64-uec  # noqa
+        http://localhost/api/glance/images?sort_dir=desc&sort_key=name&name=cirros-0.3.2-x86_64-uec
 
         The following get parameters may be passed in the GET
         request:
@@ -249,7 +249,7 @@ class MetadefsNamespaces(generic.View):
         a namespace.
 
         Example GET:
-        http://localhost/api/glance/metadefs/namespaces?resource_types=OS::Nova::Flavor&sort_dir=desc&marker=OS::Compute::Watchdog&paginate=False&sort_key=namespace  # noqa
+        http://localhost/api/glance/metadefs/namespaces?resource_types=OS::Nova::Flavor&sort_dir=desc&marker=OS::Compute::Watchdog&paginate=False&sort_key=namespace
 
         The following get parameters may be passed in the GET
         request:
diff --git a/openstack_dashboard/api/vpn.py b/openstack_dashboard/api/vpn.py
index 0273123664..81e11302d0 100644
--- a/openstack_dashboard/api/vpn.py
+++ b/openstack_dashboard/api/vpn.py
@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 from collections import OrderedDict
 
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 
 from openstack_dashboard.api import neutron
 from openstack_dashboard.contrib.developer.profiler import api as profiler
diff --git a/openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py b/openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py
index 4acab132f4..e97149ea0f 100644
--- a/openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py
+++ b/openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py
@@ -17,4 +17,5 @@ PANEL = 'resource_browser'
 PANEL_GROUP = 'default'
 PANEL_DASHBOARD = 'developer'
 
-ADD_PANEL = 'openstack_dashboard.contrib.developer.resource_browser.panel.ResourceBrowser'  # noqa
+ADD_PANEL = ('openstack_dashboard.contrib.developer.resource_browser.panel.'
+             'ResourceBrowser')
diff --git a/openstack_dashboard/dashboards/admin/aggregates/tests.py b/openstack_dashboard/dashboards/admin/aggregates/tests.py
index 61cb3b952b..a5f45152c1 100644
--- a/openstack_dashboard/dashboards/admin/aggregates/tests.py
+++ b/openstack_dashboard/dashboards/admin/aggregates/tests.py
@@ -15,7 +15,7 @@ import mock
 from django.core.urlresolvers import reverse
 from django import http
 from django.utils import html
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.admin.aggregates import constants
diff --git a/openstack_dashboard/dashboards/admin/defaults/tests.py b/openstack_dashboard/dashboards/admin/defaults/tests.py
index 6e51597f65..630a140ab9 100644
--- a/openstack_dashboard/dashboards/admin/defaults/tests.py
+++ b/openstack_dashboard/dashboards/admin/defaults/tests.py
@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/flavors/tests.py b/openstack_dashboard/dashboards/admin/flavors/tests.py
index b9ef8cfefc..27b791939b 100644
--- a/openstack_dashboard/dashboards/admin/flavors/tests.py
+++ b/openstack_dashboard/dashboards/admin/flavors/tests.py
@@ -14,7 +14,7 @@ import django
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/floating_ips/tests.py b/openstack_dashboard/dashboards/admin/floating_ips/tests.py
index 092df4118f..0f84383578 100644
--- a/openstack_dashboard/dashboards/admin/floating_ips/tests.py
+++ b/openstack_dashboard/dashboards/admin/floating_ips/tests.py
@@ -15,7 +15,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py
index 060efa5b6a..a590db475c 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py
+++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py
@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/tests.py b/openstack_dashboard/dashboards/admin/hypervisors/tests.py
index 647e11e546..7a3ed51bcc 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/tests.py
+++ b/openstack_dashboard/dashboards/admin/hypervisors/tests.py
@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py
index dfe09e94eb..f888b7b7dc 100644
--- a/openstack_dashboard/dashboards/admin/images/tests.py
+++ b/openstack_dashboard/dashboards/admin/images/tests.py
@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/info/tests.py b/openstack_dashboard/dashboards/admin/info/tests.py
index 61570d028d..ce4e3df5f9 100644
--- a/openstack_dashboard/dashboards/admin/info/tests.py
+++ b/openstack_dashboard/dashboards/admin/info/tests.py
@@ -14,8 +14,8 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/instances/tables.py b/openstack_dashboard/dashboards/admin/instances/tables.py
index bb62345a2c..f17498c05c 100644
--- a/openstack_dashboard/dashboards/admin/instances/tables.py
+++ b/openstack_dashboard/dashboards/admin/instances/tables.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from django.core import urlresolvers
-from django.template.defaultfilters import title  # noqa
+from django.template.defaultfilters import title
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
diff --git a/openstack_dashboard/dashboards/admin/instances/tests.py b/openstack_dashboard/dashboards/admin/instances/tests.py
index a27314192d..89e4388ef8 100644
--- a/openstack_dashboard/dashboards/admin/instances/tests.py
+++ b/openstack_dashboard/dashboards/admin/instances/tests.py
@@ -18,7 +18,7 @@ import uuid
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/forms.py b/openstack_dashboard/dashboards/admin/metadata_defs/forms.py
index 3b9c6b8648..c33653c320 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/forms.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/forms.py
@@ -19,7 +19,7 @@ Forms for managing metadata.
 import json
 
 from django.core.urlresolvers import reverse
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/tests.py b/openstack_dashboard/dashboards/admin/metadata_defs/tests.py
index 8086105a38..026d51f8de 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/tests.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/tests.py
@@ -19,7 +19,7 @@ import json
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/urls.py b/openstack_dashboard/dashboards/admin/metadata_defs/urls.py
index 5c58573430..2721ff5b3f 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/urls.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/urls.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.conf.urls import url  # noqa
+from django.conf.urls import url
 
 from openstack_dashboard.dashboards.admin.metadata_defs import views
 
diff --git a/openstack_dashboard/dashboards/admin/networks/agents/tests.py b/openstack_dashboard/dashboards/admin/networks/agents/tests.py
index 6207dcc984..7c2e4fdb77 100644
--- a/openstack_dashboard/dashboards/admin/networks/agents/tests.py
+++ b/openstack_dashboard/dashboards/admin/networks/agents/tests.py
@@ -16,7 +16,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/networks/ports/tests.py b/openstack_dashboard/dashboards/admin/networks/ports/tests.py
index 22f5d1d3f7..37ee93207e 100644
--- a/openstack_dashboard/dashboards/admin/networks/ports/tests.py
+++ b/openstack_dashboard/dashboards/admin/networks/ports/tests.py
@@ -16,7 +16,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/networks/subnets/tests.py b/openstack_dashboard/dashboards/admin/networks/subnets/tests.py
index 883fc46d4f..de4f603666 100644
--- a/openstack_dashboard/dashboards/admin/networks/subnets/tests.py
+++ b/openstack_dashboard/dashboards/admin/networks/subnets/tests.py
@@ -15,7 +15,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon.workflows import views
 
diff --git a/openstack_dashboard/dashboards/admin/networks/tests.py b/openstack_dashboard/dashboards/admin/networks/tests.py
index a1598bb049..55de397204 100644
--- a/openstack_dashboard/dashboards/admin/networks/tests.py
+++ b/openstack_dashboard/dashboards/admin/networks/tests.py
@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils.http import urlunquote
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import forms
 
diff --git a/openstack_dashboard/dashboards/admin/overview/tests.py b/openstack_dashboard/dashboards/admin/overview/tests.py
index c223119a5d..29236eb206 100644
--- a/openstack_dashboard/dashboards/admin/overview/tests.py
+++ b/openstack_dashboard/dashboards/admin/overview/tests.py
@@ -24,7 +24,7 @@ from django.test.utils import override_settings
 from django.utils import encoding
 from django.utils import timezone
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon.templatetags import sizeformat
 
diff --git a/openstack_dashboard/dashboards/admin/overview/views.py b/openstack_dashboard/dashboards/admin/overview/views.py
index 58c0b49f2d..cc258aad4e 100644
--- a/openstack_dashboard/dashboards/admin/overview/views.py
+++ b/openstack_dashboard/dashboards/admin/overview/views.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 from django.conf import settings
-from django.template.defaultfilters import floatformat  # noqa
+from django.template.defaultfilters import floatformat
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
 
diff --git a/openstack_dashboard/dashboards/admin/routers/tests.py b/openstack_dashboard/dashboards/admin/routers/tests.py
index b27947052a..50e3b72761 100644
--- a/openstack_dashboard/dashboards/admin/routers/tests.py
+++ b/openstack_dashboard/dashboards/admin/routers/tests.py
@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.routers import tests as r_test
diff --git a/openstack_dashboard/dashboards/admin/snapshots/tests.py b/openstack_dashboard/dashboards/admin/snapshots/tests.py
index c106954f96..040cefd8fa 100644
--- a/openstack_dashboard/dashboards/admin/snapshots/tests.py
+++ b/openstack_dashboard/dashboards/admin/snapshots/tests.py
@@ -15,7 +15,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 from django.utils.http import urlunquote
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard.api import cinder
 from openstack_dashboard.api import keystone
diff --git a/openstack_dashboard/dashboards/admin/volume_types/extras/tests.py b/openstack_dashboard/dashboards/admin/volume_types/extras/tests.py
index bed99dd02d..9ccfe93560 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/extras/tests.py
+++ b/openstack_dashboard/dashboards/admin/volume_types/extras/tests.py
@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/volume_types/forms.py b/openstack_dashboard/dashboards/admin/volume_types/forms.py
index 1ca8c417e2..9e9c5d4dab 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/forms.py
+++ b/openstack_dashboard/dashboards/admin/volume_types/forms.py
@@ -11,7 +11,7 @@
 #    under the License.
 
 from django.core.urlresolvers import reverse
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions
diff --git a/openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py b/openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py
index b8ff0ae32c..73ec507662 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py
+++ b/openstack_dashboard/dashboards/admin/volume_types/qos_specs/tests.py
@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py b/openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py
index 43f08bc437..a75ab91c0f 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py
+++ b/openstack_dashboard/dashboards/admin/volume_types/qos_specs/views.py
@@ -16,7 +16,7 @@ from django.utils.translation import ugettext_lazy as _
 from horizon import exceptions
 from horizon import forms
 from horizon import tables
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.admin.volume_types.qos_specs \
diff --git a/openstack_dashboard/dashboards/admin/volume_types/tests.py b/openstack_dashboard/dashboards/admin/volume_types/tests.py
index ea8894ac82..aa44bbbcef 100644
--- a/openstack_dashboard/dashboards/admin/volume_types/tests.py
+++ b/openstack_dashboard/dashboards/admin/volume_types/tests.py
@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import exceptions
 
diff --git a/openstack_dashboard/dashboards/admin/volumes/tests.py b/openstack_dashboard/dashboards/admin/volumes/tests.py
index 14618600b0..efa045d8bb 100644
--- a/openstack_dashboard/dashboards/admin/volumes/tests.py
+++ b/openstack_dashboard/dashboards/admin/volumes/tests.py
@@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 from django.utils.http import urlunquote
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder
diff --git a/openstack_dashboard/dashboards/identity/domains/tests.py b/openstack_dashboard/dashboards/identity/domains/tests.py
index 79b19c0c23..7517315d1b 100644
--- a/openstack_dashboard/dashboards/identity/domains/tests.py
+++ b/openstack_dashboard/dashboards/identity/domains/tests.py
@@ -16,8 +16,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from horizon.workflows import views
 
diff --git a/openstack_dashboard/dashboards/identity/groups/tests.py b/openstack_dashboard/dashboards/identity/groups/tests.py
index 0f9fb2c7c7..6b1e006e04 100644
--- a/openstack_dashboard/dashboards/identity/groups/tests.py
+++ b/openstack_dashboard/dashboards/identity/groups/tests.py
@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py b/openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py
index 3073ed8424..144e45c022 100644
--- a/openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py
+++ b/openstack_dashboard/dashboards/identity/identity_providers/protocols/tests.py
@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/identity_providers/tests.py b/openstack_dashboard/dashboards/identity/identity_providers/tests.py
index 34767120f8..81575458eb 100644
--- a/openstack_dashboard/dashboards/identity/identity_providers/tests.py
+++ b/openstack_dashboard/dashboards/identity/identity_providers/tests.py
@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/mappings/tests.py b/openstack_dashboard/dashboards/identity/mappings/tests.py
index c9f2dce76f..9afa5d69ee 100644
--- a/openstack_dashboard/dashboards/identity/mappings/tests.py
+++ b/openstack_dashboard/dashboards/identity/mappings/tests.py
@@ -17,8 +17,8 @@ import json
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/projects/tests.py b/openstack_dashboard/dashboards/identity/projects/tests.py
index d3d52a3b73..6cd238159b 100644
--- a/openstack_dashboard/dashboards/identity/projects/tests.py
+++ b/openstack_dashboard/dashboards/identity/projects/tests.py
@@ -23,8 +23,8 @@ from django import http
 from django.test.utils import override_settings
 from django.utils import timezone
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from horizon.workflows import views
 
diff --git a/openstack_dashboard/dashboards/identity/roles/tests.py b/openstack_dashboard/dashboards/identity/roles/tests.py
index d5766f35c7..5be84fe33a 100644
--- a/openstack_dashboard/dashboards/identity/roles/tests.py
+++ b/openstack_dashboard/dashboards/identity/roles/tests.py
@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/users/forms.py b/openstack_dashboard/dashboards/identity/users/forms.py
index f5fed23a02..74bfa2564d 100644
--- a/openstack_dashboard/dashboards/identity/users/forms.py
+++ b/openstack_dashboard/dashboards/identity/users/forms.py
@@ -20,10 +20,10 @@ import collections
 import logging
 
 from django.conf import settings
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django import http
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/identity/users/tests.py b/openstack_dashboard/dashboards/identity/users/tests.py
index 10db5e8f92..84b3305bbb 100644
--- a/openstack_dashboard/dashboards/identity/users/tests.py
+++ b/openstack_dashboard/dashboards/identity/users/tests.py
@@ -16,15 +16,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from socket import timeout as socket_timeout  # noqa
+from socket import timeout as socket_timeout
 
 import django
 from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/identity/users/views.py b/openstack_dashboard/dashboards/identity/users/views.py
index bda08c9ec4..3061668376 100644
--- a/openstack_dashboard/dashboards/identity/users/views.py
+++ b/openstack_dashboard/dashboards/identity/users/views.py
@@ -22,9 +22,9 @@ import operator
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
-from django.utils.decorators import method_decorator  # noqa
+from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_post_parameters  # noqa
+from django.views.decorators.debug import sensitive_post_parameters
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/project/api_access/tables.py b/openstack_dashboard/dashboards/project/api_access/tables.py
index 59718f82ec..23469ece8b 100644
--- a/openstack_dashboard/dashboards/project/api_access/tables.py
+++ b/openstack_dashboard/dashboards/project/api_access/tables.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from django.template.defaultfilters import title  # noqa
+from django.template.defaultfilters import title
 from django.utils.translation import ugettext_lazy as _
 
 from openstack_auth import utils
diff --git a/openstack_dashboard/dashboards/project/api_access/tests.py b/openstack_dashboard/dashboards/project/api_access/tests.py
index 1cdf0236e6..6a717e7592 100644
--- a/openstack_dashboard/dashboards/project/api_access/tests.py
+++ b/openstack_dashboard/dashboards/project/api_access/tests.py
@@ -15,10 +15,10 @@
 import six
 
 from django.core.urlresolvers import reverse
-from django.http import HttpRequest  # noqa
-from django.test.utils import override_settings  # noqa
+from django.http import HttpRequest
+from django.test.utils import override_settings
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/api_access/views.py b/openstack_dashboard/dashboards/project/api_access/views.py
index e993d12362..e7affbe604 100644
--- a/openstack_dashboard/dashboards/project/api_access/views.py
+++ b/openstack_dashboard/dashboards/project/api_access/views.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from contextlib import closing  # noqa
+from contextlib import closing
 import logging
 import tempfile
 import zipfile
diff --git a/openstack_dashboard/dashboards/project/backups/tests.py b/openstack_dashboard/dashboards/project/backups/tests.py
index 96fa002560..ac1a0d6c1a 100644
--- a/openstack_dashboard/dashboards/project/backups/tests.py
+++ b/openstack_dashboard/dashboards/project/backups/tests.py
@@ -16,7 +16,7 @@ from django import http
 from django.test.utils import override_settings
 from django.utils.http import urlencode
 from django.utils.http import urlunquote
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.backups \
diff --git a/openstack_dashboard/dashboards/project/cg_snapshots/tests.py b/openstack_dashboard/dashboards/project/cg_snapshots/tests.py
index 7ac5e3bb9a..5bdf270ece 100644
--- a/openstack_dashboard/dashboards/project/cg_snapshots/tests.py
+++ b/openstack_dashboard/dashboards/project/cg_snapshots/tests.py
@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard.api import cinder
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/cgroups/tests.py b/openstack_dashboard/dashboards/project/cgroups/tests.py
index 6e551c5f94..44b4919aba 100644
--- a/openstack_dashboard/dashboards/project/cgroups/tests.py
+++ b/openstack_dashboard/dashboards/project/cgroups/tests.py
@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 from django.utils.http import urlunquote
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard.api import cinder
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/firewalls/tests.py b/openstack_dashboard/dashboards/project/firewalls/tests.py
index d780ee3124..beb32aebf6 100644
--- a/openstack_dashboard/dashboards/project/firewalls/tests.py
+++ b/openstack_dashboard/dashboards/project/firewalls/tests.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from django.core.urlresolvers import reverse
 from django import http
diff --git a/openstack_dashboard/dashboards/project/floating_ips/tables.py b/openstack_dashboard/dashboards/project/floating_ips/tables.py
index c894b8dd2b..88ab925f45 100644
--- a/openstack_dashboard/dashboards/project/floating_ips/tables.py
+++ b/openstack_dashboard/dashboards/project/floating_ips/tables.py
@@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse
 from django import shortcuts
 from django.utils.http import urlencode
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import string_concat  # noqa
+from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
diff --git a/openstack_dashboard/dashboards/project/floating_ips/tests.py b/openstack_dashboard/dashboards/project/floating_ips/tests.py
index fe61c39f3b..5ae49f825d 100644
--- a/openstack_dashboard/dashboards/project/floating_ips/tests.py
+++ b/openstack_dashboard/dashboards/project/floating_ips/tests.py
@@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils.http import urlencode
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/project/images/images/forms.py b/openstack_dashboard/dashboards/project/images/images/forms.py
index 1032fc4587..4b306c6791 100644
--- a/openstack_dashboard/dashboards/project/images/images/forms.py
+++ b/openstack_dashboard/dashboards/project/images/images/forms.py
@@ -22,8 +22,8 @@ Views for managing images.
 
 from django.conf import settings
 from django.core import validators
-from django.forms import ValidationError  # noqa
-from django.forms.widgets import HiddenInput  # noqa
+from django.forms import ValidationError
+from django.forms.widgets import HiddenInput
 from django.template import defaultfilters
 from django.utils.translation import ugettext_lazy as _
 import six
diff --git a/openstack_dashboard/dashboards/project/images/images/tables.py b/openstack_dashboard/dashboards/project/images/images/tables.py
index 030687d4ee..197177ff45 100644
--- a/openstack_dashboard/dashboards/project/images/images/tables.py
+++ b/openstack_dashboard/dashboards/project/images/images/tables.py
@@ -23,7 +23,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
 from horizon import tables
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 
 from openstack_dashboard import api
 
diff --git a/openstack_dashboard/dashboards/project/images/images/tests.py b/openstack_dashboard/dashboards/project/images/images/tests.py
index df0e21699b..327434773e 100644
--- a/openstack_dashboard/dashboards/project/images/images/tests.py
+++ b/openstack_dashboard/dashboards/project/images/images/tests.py
@@ -19,13 +19,13 @@
 import tempfile
 
 from django.conf import settings
-from django.core.files.uploadedfile import InMemoryUploadedFile  # noqa
+from django.core.files.uploadedfile import InMemoryUploadedFile
 from django.core.urlresolvers import reverse
-from django.forms.widgets import HiddenInput  # noqa
+from django.forms.widgets import HiddenInput
 from django import http
 from django.test.utils import override_settings
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import tables as horizon_tables
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/project/images/snapshots/tests.py b/openstack_dashboard/dashboards/project/images/snapshots/tests.py
index 5ac1b2c439..952f1d7425 100644
--- a/openstack_dashboard/dashboards/project/images/snapshots/tests.py
+++ b/openstack_dashboard/dashboards/project/images/snapshots/tests.py
@@ -19,7 +19,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/images/tests.py b/openstack_dashboard/dashboards/project/images/tests.py
index af039d2660..8de61bccb3 100644
--- a/openstack_dashboard/dashboards/project/images/tests.py
+++ b/openstack_dashboard/dashboards/project/images/tests.py
@@ -18,7 +18,7 @@
 #    under the License.
 
 import os
-from socket import timeout as socket_timeout  # noqa
+from socket import timeout as socket_timeout
 import unittest
 
 from django.core.urlresolvers import reverse
@@ -26,7 +26,7 @@ from django import http
 
 from glanceclient.common import exceptions as glance_exec
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from horizon import exceptions
diff --git a/openstack_dashboard/dashboards/project/instances/forms.py b/openstack_dashboard/dashboards/project/instances/forms.py
index 0b2ec47540..bbc1dc44f1 100644
--- a/openstack_dashboard/dashboards/project/instances/forms.py
+++ b/openstack_dashboard/dashboards/project/instances/forms.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 from django.core.urlresolvers import reverse
-from django.template.defaultfilters import filesizeformat  # noqa
+from django.template.defaultfilters import filesizeformat
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py
index 925983cd15..7735bfec59 100644
--- a/openstack_dashboard/dashboards/project/instances/tables.py
+++ b/openstack_dashboard/dashboards/project/instances/tables.py
@@ -17,14 +17,14 @@ import logging
 
 from django.conf import settings
 from django.core import urlresolvers
-from django.http import HttpResponse  # noqa
+from django.http import HttpResponse
 from django import shortcuts
 from django import template
-from django.template.defaultfilters import title  # noqa
+from django.template.defaultfilters import title
 from django.utils.http import urlencode
 from django.utils.translation import npgettext_lazy
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import string_concat  # noqa
+from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
diff --git a/openstack_dashboard/dashboards/project/instances/tests.py b/openstack_dashboard/dashboards/project/instances/tests.py
index 1496f5f67d..60c43bc8a1 100644
--- a/openstack_dashboard/dashboards/project/instances/tests.py
+++ b/openstack_dashboard/dashboards/project/instances/tests.py
@@ -23,15 +23,15 @@ import sys
 
 import django
 from django.conf import settings
-from django.contrib.auth import REDIRECT_FIELD_NAME  # noqa
+from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.core.urlresolvers import reverse
 from django.forms import widgets
 from django import http
 import django.test
 from django.test.utils import override_settings
 from django.utils.http import urlencode
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 import six
 
 from horizon import exceptions
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/__init__.py b/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
index 82f134a8dd..5cc19ca532 100644
--- a/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
+++ b/openstack_dashboard/dashboards/project/instances/workflows/__init__.py
@@ -1,5 +1,24 @@
-# Importing non-modules that are not used explicitly
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
-from .create_instance import LaunchInstance  # noqa
-from .resize_instance import ResizeInstance  # noqa
-from .update_instance import UpdateInstance  # noqa
+from openstack_dashboard.dashboards.project.instances.workflows.\
+    create_instance import LaunchInstance
+from openstack_dashboard.dashboards.project.instances.workflows.\
+    resize_instance import ResizeInstance
+from openstack_dashboard.dashboards.project.instances.workflows.\
+    update_instance import UpdateInstance
+
+__all__ = [
+    'LaunchInstance',
+    'ResizeInstance',
+    'UpdateInstance',
+]
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
index 1c6ceeb699..9ca7e89e91 100644
--- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
+++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py
@@ -23,10 +23,10 @@ import operator
 from oslo_utils import units
 import six
 
-from django.template.defaultfilters import filesizeformat  # noqa
-from django.utils.text import normalize_newlines  # noqa
+from django.template.defaultfilters import filesizeformat
+from django.utils.text import normalize_newlines
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py
index f71baf805d..eaa1ec7ce7 100644
--- a/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py
+++ b/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py
@@ -16,7 +16,7 @@
 import json
 
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/project/key_pairs/views.py b/openstack_dashboard/dashboards/project/key_pairs/views.py
index 9b920ababe..81bf525b2c 100644
--- a/openstack_dashboard/dashboards/project/key_pairs/views.py
+++ b/openstack_dashboard/dashboards/project/key_pairs/views.py
@@ -15,7 +15,7 @@
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django import http
-from django.template.defaultfilters import slugify  # noqa
+from django.template.defaultfilters import slugify
 from django.utils.decorators import method_decorator
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.cache import cache_control
diff --git a/openstack_dashboard/dashboards/project/network_topology/tests.py b/openstack_dashboard/dashboards/project/network_topology/tests.py
index c1d115efc1..0328219022 100644
--- a/openstack_dashboard/dashboards/project/network_topology/tests.py
+++ b/openstack_dashboard/dashboards/project/network_topology/tests.py
@@ -16,7 +16,7 @@ from django.core.urlresolvers import reverse
 from django import http
 import django.test
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 from oslo_serialization import jsonutils
 
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/project/network_topology/views.py b/openstack_dashboard/dashboards/project/network_topology/views.py
index 4bc3b4d83d..abe66205f4 100644
--- a/openstack_dashboard/dashboards/project/network_topology/views.py
+++ b/openstack_dashboard/dashboards/project/network_topology/views.py
@@ -21,9 +21,9 @@ import json
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
-from django.http import HttpResponse  # noqa
+from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
-from django.views.generic import View  # noqa
+from django.views.generic import View
 
 from horizon import exceptions
 from horizon import tabs
diff --git a/openstack_dashboard/dashboards/project/networks/ports/tests.py b/openstack_dashboard/dashboards/project/networks/ports/tests.py
index 24a9d8c10d..fd843ab138 100644
--- a/openstack_dashboard/dashboards/project/networks/ports/tests.py
+++ b/openstack_dashboard/dashboards/project/networks/ports/tests.py
@@ -18,7 +18,7 @@ import copy
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/networks/subnets/tests.py b/openstack_dashboard/dashboards/project/networks/subnets/tests.py
index 6b5650884e..671ff0d2da 100644
--- a/openstack_dashboard/dashboards/project/networks/subnets/tests.py
+++ b/openstack_dashboard/dashboards/project/networks/subnets/tests.py
@@ -15,7 +15,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon.workflows import views
 
diff --git a/openstack_dashboard/dashboards/project/networks/tests.py b/openstack_dashboard/dashboards/project/networks/tests.py
index 659dc5d2b7..0d7ce0bcb7 100644
--- a/openstack_dashboard/dashboards/project/networks/tests.py
+++ b/openstack_dashboard/dashboards/project/networks/tests.py
@@ -19,7 +19,7 @@ from django.utils.http import urlunquote
 
 from horizon.workflows import views
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/project/overview/tests.py b/openstack_dashboard/dashboards/project/overview/tests.py
index 1770e825d6..46b958b829 100644
--- a/openstack_dashboard/dashboards/project/overview/tests.py
+++ b/openstack_dashboard/dashboards/project/overview/tests.py
@@ -20,13 +20,13 @@ import datetime
 import logging
 
 from django.conf import settings
-from django.contrib.auth import REDIRECT_FIELD_NAME  # noqa
+from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 from django.utils import timezone
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/overview/views.py b/openstack_dashboard/dashboards/project/overview/views.py
index d6d1d157c3..fde93b0b43 100644
--- a/openstack_dashboard/dashboards/project/overview/views.py
+++ b/openstack_dashboard/dashboards/project/overview/views.py
@@ -17,8 +17,8 @@
 #    under the License.
 
 
-from django.template.defaultfilters import capfirst  # noqa
-from django.template.defaultfilters import floatformat  # noqa
+from django.template.defaultfilters import capfirst
+from django.template.defaultfilters import floatformat
 from django.utils.translation import ugettext_lazy as _
 
 from horizon.utils import csvbase
diff --git a/openstack_dashboard/dashboards/project/routers/tests.py b/openstack_dashboard/dashboards/project/routers/tests.py
index dc4502d01e..ae2c271486 100644
--- a/openstack_dashboard/dashboards/project/routers/tests.py
+++ b/openstack_dashboard/dashboards/project/routers/tests.py
@@ -17,8 +17,8 @@ import django
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IgnoreArg  # noqa
-from mox3.mox import IsA  # noqa
+from mox3.mox import IgnoreArg
+from mox3.mox import IsA
 import six
 
 from openstack_dashboard import api
diff --git a/openstack_dashboard/dashboards/project/security_groups/forms.py b/openstack_dashboard/dashboards/project/security_groups/forms.py
index 7ef5488472..13cc47add7 100644
--- a/openstack_dashboard/dashboards/project/security_groups/forms.py
+++ b/openstack_dashboard/dashboards/project/security_groups/forms.py
@@ -20,7 +20,7 @@ import netaddr
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
 import six
diff --git a/openstack_dashboard/dashboards/project/security_groups/tests.py b/openstack_dashboard/dashboards/project/security_groups/tests.py
index 52d1aed5bc..88593c175d 100644
--- a/openstack_dashboard/dashboards/project/security_groups/tests.py
+++ b/openstack_dashboard/dashboards/project/security_groups/tests.py
@@ -24,7 +24,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/project/snapshots/tests.py b/openstack_dashboard/dashboards/project/snapshots/tests.py
index 2abee07e66..d912c433b3 100644
--- a/openstack_dashboard/dashboards/project/snapshots/tests.py
+++ b/openstack_dashboard/dashboards/project/snapshots/tests.py
@@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 from django.utils.http import urlunquote
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder
diff --git a/openstack_dashboard/dashboards/project/stacks/forms.py b/openstack_dashboard/dashboards/project/stacks/forms.py
index a528960680..ac622cb1b9 100644
--- a/openstack_dashboard/dashboards/project/stacks/forms.py
+++ b/openstack_dashboard/dashboards/project/stacks/forms.py
@@ -17,7 +17,7 @@ import django
 from django.conf import settings
 from django.utils import html
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from oslo_utils import strutils
 import six
diff --git a/openstack_dashboard/dashboards/project/stacks/mappings.py b/openstack_dashboard/dashboards/project/stacks/mappings.py
index 5d2f24afa2..051f317a27 100644
--- a/openstack_dashboard/dashboards/project/stacks/mappings.py
+++ b/openstack_dashboard/dashboards/project/stacks/mappings.py
@@ -15,7 +15,7 @@ import logging
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.template.defaultfilters import register  # noqa
+from django.template.defaultfilters import register
 from django.utils import html
 from django.utils import safestring
 import six
diff --git a/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py b/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py
index d634ab2310..4c73644beb 100644
--- a/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py
+++ b/openstack_dashboard/dashboards/project/stacks/resource_types/tests.py
@@ -14,7 +14,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/stacks/sro.py b/openstack_dashboard/dashboards/project/stacks/sro.py
index a43685feb7..4250e7ee9e 100644
--- a/openstack_dashboard/dashboards/project/stacks/sro.py
+++ b/openstack_dashboard/dashboards/project/stacks/sro.py
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from django.template.defaultfilters import title  # noqa
+from django.template.defaultfilters import title
 from django.template.loader import render_to_string
 
 from horizon.utils import filters
diff --git a/openstack_dashboard/dashboards/project/stacks/tables.py b/openstack_dashboard/dashboards/project/stacks/tables.py
index af85bfa36b..5842399079 100644
--- a/openstack_dashboard/dashboards/project/stacks/tables.py
+++ b/openstack_dashboard/dashboards/project/stacks/tables.py
@@ -11,8 +11,8 @@
 # under the License.
 
 from django.core import urlresolvers
-from django.http import Http404  # noqa
-from django.template.defaultfilters import title  # noqa
+from django.http import Http404
+from django.template.defaultfilters import title
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
diff --git a/openstack_dashboard/dashboards/project/stacks/template_versions/tests.py b/openstack_dashboard/dashboards/project/stacks/template_versions/tests.py
index 064b134aa6..fcace15f47 100644
--- a/openstack_dashboard/dashboards/project/stacks/template_versions/tests.py
+++ b/openstack_dashboard/dashboards/project/stacks/template_versions/tests.py
@@ -14,7 +14,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/project/stacks/tests.py b/openstack_dashboard/dashboards/project/stacks/tests.py
index 4f0675ed81..62d0c79bb7 100644
--- a/openstack_dashboard/dashboards/project/stacks/tests.py
+++ b/openstack_dashboard/dashboards/project/stacks/tests.py
@@ -18,10 +18,10 @@ from django.conf import settings
 from django.core import exceptions
 from django.core.urlresolvers import reverse
 from django import http
-from django.test.utils import override_settings  # noqa
+from django.test.utils import override_settings
 from django.utils import html
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from heatclient.common import template_format as hc_format
diff --git a/openstack_dashboard/dashboards/project/stacks/views.py b/openstack_dashboard/dashboards/project/stacks/views.py
index e1480c956d..f5d47ec560 100644
--- a/openstack_dashboard/dashboards/project/stacks/views.py
+++ b/openstack_dashboard/dashboards/project/stacks/views.py
@@ -17,7 +17,7 @@ import yaml
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
-from django.http import HttpResponse  # noqa
+from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 import django.views.generic
 
diff --git a/openstack_dashboard/dashboards/project/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/forms.py
index d7a8e885c5..44ac7a7b69 100644
--- a/openstack_dashboard/dashboards/project/volumes/forms.py
+++ b/openstack_dashboard/dashboards/project/volumes/forms.py
@@ -19,9 +19,9 @@ Views for managing volumes.
 
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django import http
-from django.template.defaultfilters import filesizeformat  # noqa
+from django.template.defaultfilters import filesizeformat
 from django.utils.translation import pgettext_lazy
 from django.utils.translation import ugettext_lazy as _
 
@@ -29,7 +29,7 @@ from horizon import exceptions
 from horizon import forms
 from horizon import messages
 from horizon.utils import functions
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder
diff --git a/openstack_dashboard/dashboards/project/volumes/tables.py b/openstack_dashboard/dashboards/project/volumes/tables.py
index 80244ad7e2..282134b550 100644
--- a/openstack_dashboard/dashboards/project/volumes/tables.py
+++ b/openstack_dashboard/dashboards/project/volumes/tables.py
@@ -13,16 +13,16 @@
 #    under the License.
 
 from django.conf import settings
-from django.core.urlresolvers import NoReverseMatch  # noqa
+from django.core.urlresolvers import NoReverseMatch
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse  # noqa
+from django.http import HttpResponse
 from django.template import defaultfilters as filters
 from django.utils import html
 from django.utils.http import urlencode
 from django.utils import safestring
 from django.utils.translation import npgettext_lazy
 from django.utils.translation import pgettext_lazy
-from django.utils.translation import string_concat  # noqa
+from django.utils.translation import string_concat
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
diff --git a/openstack_dashboard/dashboards/project/volumes/tests.py b/openstack_dashboard/dashboards/project/volumes/tests.py
index c4db43f5c1..0a0347db18 100644
--- a/openstack_dashboard/dashboards/project/volumes/tests.py
+++ b/openstack_dashboard/dashboards/project/volumes/tests.py
@@ -21,11 +21,11 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.forms import widgets
 from django import http
-from django.template.defaultfilters import slugify  # noqa
+from django.template.defaultfilters import slugify
 from django.test.utils import override_settings
 from django.utils.http import urlunquote
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder
diff --git a/openstack_dashboard/dashboards/project/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/views.py
index 777ba29da3..c10489fd41 100644
--- a/openstack_dashboard/dashboards/project/volumes/views.py
+++ b/openstack_dashboard/dashboards/project/volumes/views.py
@@ -22,7 +22,7 @@ import json
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django import http
-from django.template.defaultfilters import slugify  # noqa
+from django.template.defaultfilters import slugify
 from django.utils.decorators import method_decorator
 from django.utils import encoding
 from django.utils.translation import ugettext_lazy as _
diff --git a/openstack_dashboard/dashboards/project/vpn/tests.py b/openstack_dashboard/dashboards/project/vpn/tests.py
index b976a9e421..617e91e46c 100644
--- a/openstack_dashboard/dashboards/project/vpn/tests.py
+++ b/openstack_dashboard/dashboards/project/vpn/tests.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from django.core.urlresolvers import reverse
 from django import http
diff --git a/openstack_dashboard/dashboards/settings/password/forms.py b/openstack_dashboard/dashboards/settings/password/forms.py
index 26f342fa69..2bc32c0c0c 100644
--- a/openstack_dashboard/dashboards/settings/password/forms.py
+++ b/openstack_dashboard/dashboards/settings/password/forms.py
@@ -13,10 +13,10 @@
 #    under the License.
 
 from django.conf import settings
-from django.forms import ValidationError  # noqa
+from django.forms import ValidationError
 from django import http
 from django.utils.translation import ugettext_lazy as _
-from django.views.decorators.debug import sensitive_variables  # noqa
+from django.views.decorators.debug import sensitive_variables
 
 from horizon import exceptions
 from horizon import forms
diff --git a/openstack_dashboard/dashboards/settings/password/tests.py b/openstack_dashboard/dashboards/settings/password/tests.py
index 7c04ea04e1..27f57c1441 100644
--- a/openstack_dashboard/dashboards/settings/password/tests.py
+++ b/openstack_dashboard/dashboards/settings/password/tests.py
@@ -15,9 +15,9 @@
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django import http
-from django.utils.six.moves.urllib.parse import urlsplit  # noqa
+from django.utils.six.moves.urllib.parse import urlsplit
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/dashboards/settings/user/forms.py b/openstack_dashboard/dashboards/settings/user/forms.py
index e26f735640..ec9f029474 100644
--- a/openstack_dashboard/dashboards/settings/user/forms.py
+++ b/openstack_dashboard/dashboards/settings/user/forms.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from datetime import datetime  # noqa
+from datetime import datetime
 import string
 
 import babel
diff --git a/openstack_dashboard/management/commands/make_web_conf.py b/openstack_dashboard/management/commands/make_web_conf.py
index 2dda25d0a8..a0be0b0a9e 100644
--- a/openstack_dashboard/management/commands/make_web_conf.py
+++ b/openstack_dashboard/management/commands/make_web_conf.py
@@ -21,8 +21,8 @@ import sys
 import warnings
 
 from django.conf import settings
-from django.core.management.base import BaseCommand  # noqa
-from django.template import Context, Template  # noqa
+from django.core.management import base
+from django import template
 
 # Suppress DeprecationWarnings which clutter the output to the point of
 # rendering it unreadable.
@@ -65,7 +65,7 @@ def _getattr(obj, name, default):
         return default
 
 
-context = Context({
+context = template.Context({
     'DJANGO_SETTINGS_MODULE': os.environ['DJANGO_SETTINGS_MODULE'],
     'HOSTNAME': socket.getfqdn(),
     'PROJECT_PATH': os.path.realpath(
@@ -136,7 +136,7 @@ def find_apache_log_dir():
 context['LOGDIR'] = find_apache_log_dir()
 
 
-class Command(BaseCommand):
+class Command(base.BaseCommand):
 
     args = ''
     help = """Create %(wsgi_file)s
@@ -301,7 +301,7 @@ location you desire, e.g.::
             with open(
                 os.path.join(CURDIR, 'horizon.wsgi.template'), 'r'
             ) as fp:
-                wsgi_template = Template(fp.read())
+                wsgi_template = template.Template(fp.read())
             if not os.path.exists(context['WSGI_FILE']) or force:
                 with open(context['WSGI_FILE'], 'w') as fp:
                     fp.write(wsgi_template.render(context))
@@ -315,7 +315,7 @@ location you desire, e.g.::
             with open(
                 os.path.join(CURDIR, 'apache_vhost.conf.template'), 'r'
             ) as fp:
-                wsgi_template = Template(fp.read())
+                wsgi_template = template.Template(fp.read())
             sys.stdout.write(wsgi_template.render(context))
         else:
             self.print_help('manage.py', cmd_name)
diff --git a/openstack_dashboard/management/commands/migrate_settings.py b/openstack_dashboard/management/commands/migrate_settings.py
index 8a9b420b12..3a4fd4cdbb 100644
--- a/openstack_dashboard/management/commands/migrate_settings.py
+++ b/openstack_dashboard/management/commands/migrate_settings.py
@@ -21,7 +21,7 @@ import sys
 import time
 import warnings
 
-from django.core.management.templates import BaseCommand  # noqa
+from django.core.management.templates import BaseCommand
 
 # Suppress DeprecationWarnings which clutter the output to the point of
 # rendering it unreadable.
diff --git a/openstack_dashboard/test/api_tests/fwaas_tests.py b/openstack_dashboard/test/api_tests/fwaas_tests.py
index d239d52854..3d0a37d57c 100644
--- a/openstack_dashboard/test/api_tests/fwaas_tests.py
+++ b/openstack_dashboard/test/api_tests/fwaas_tests.py
@@ -15,7 +15,7 @@
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test
 
-from neutronclient.v2_0.client import Client as neutronclient  # noqa
+from neutronclient.v2_0.client import Client as neutronclient
 
 
 class FwaasApiTests(test.APITestCase):
diff --git a/openstack_dashboard/test/api_tests/heat_tests.py b/openstack_dashboard/test/api_tests/heat_tests.py
index c688efe133..d241277771 100644
--- a/openstack_dashboard/test/api_tests/heat_tests.py
+++ b/openstack_dashboard/test/api_tests/heat_tests.py
@@ -12,7 +12,7 @@
 import six
 
 from django.conf import settings
-from django.test.utils import override_settings  # noqa
+from django.test.utils import override_settings
 
 from horizon import exceptions
 from openstack_dashboard import api
diff --git a/openstack_dashboard/test/api_tests/network_tests.py b/openstack_dashboard/test/api_tests/network_tests.py
index 486545d354..66b0801e32 100644
--- a/openstack_dashboard/test/api_tests/network_tests.py
+++ b/openstack_dashboard/test/api_tests/network_tests.py
@@ -17,7 +17,7 @@ import copy
 
 from django import http
 from django.test.utils import override_settings
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 import six
 
 from oslo_utils import uuidutils
diff --git a/openstack_dashboard/test/api_tests/neutron_rest_tests.py b/openstack_dashboard/test/api_tests/neutron_rest_tests.py
index 22dd64b0b9..ee82ec2464 100644
--- a/openstack_dashboard/test/api_tests/neutron_rest_tests.py
+++ b/openstack_dashboard/test/api_tests/neutron_rest_tests.py
@@ -20,7 +20,7 @@ from openstack_dashboard.api import base
 from openstack_dashboard.api.rest import neutron
 from openstack_dashboard.test import helpers as test
 from openstack_dashboard.test.test_data import neutron_data
-from openstack_dashboard.test.test_data.utils import TestData  # noqa
+from openstack_dashboard.test.test_data.utils import TestData
 
 TEST = TestData(neutron_data.data)
 
diff --git a/openstack_dashboard/test/api_tests/neutron_tests.py b/openstack_dashboard/test/api_tests/neutron_tests.py
index 9213ce7128..b835857ea0 100644
--- a/openstack_dashboard/test/api_tests/neutron_tests.py
+++ b/openstack_dashboard/test/api_tests/neutron_tests.py
@@ -13,7 +13,7 @@
 #    under the License.
 import copy
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from django import http
 from django.test.utils import override_settings
diff --git a/openstack_dashboard/test/api_tests/nova_tests.py b/openstack_dashboard/test/api_tests/nova_tests.py
index 5985f8bd56..6bd02d339e 100644
--- a/openstack_dashboard/test/api_tests/nova_tests.py
+++ b/openstack_dashboard/test/api_tests/nova_tests.py
@@ -23,7 +23,7 @@ from django.conf import settings
 from django import http
 from django.test.utils import override_settings
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 from novaclient import api_versions
 from novaclient import exceptions as nova_exceptions
 from novaclient.v2 import flavor_access as nova_flavor_access
diff --git a/openstack_dashboard/test/api_tests/policy_rest_tests.py b/openstack_dashboard/test/api_tests/policy_rest_tests.py
index b770772597..7c6589ceff 100644
--- a/openstack_dashboard/test/api_tests/policy_rest_tests.py
+++ b/openstack_dashboard/test/api_tests/policy_rest_tests.py
@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.test.utils import override_settings  # noqa
+from django.test.utils import override_settings
 
 from openstack_dashboard.api.rest import policy
 from openstack_dashboard.test import helpers as test
diff --git a/openstack_dashboard/test/api_tests/swift_rest_tests.py b/openstack_dashboard/test/api_tests/swift_rest_tests.py
index 46d290ef1b..8b9b4922cc 100644
--- a/openstack_dashboard/test/api_tests/swift_rest_tests.py
+++ b/openstack_dashboard/test/api_tests/swift_rest_tests.py
@@ -16,7 +16,7 @@ import mock
 from openstack_dashboard.api.rest import swift
 from openstack_dashboard.test import helpers as test
 from openstack_dashboard.test.test_data import swift_data
-from openstack_dashboard.test.test_data.utils import TestData  # noqa
+from openstack_dashboard.test.test_data.utils import TestData
 
 
 TEST = TestData(swift_data.data)
diff --git a/openstack_dashboard/test/api_tests/swift_tests.py b/openstack_dashboard/test/api_tests/swift_tests.py
index 36646a5418..99cc54e7ce 100644
--- a/openstack_dashboard/test/api_tests/swift_tests.py
+++ b/openstack_dashboard/test/api_tests/swift_tests.py
@@ -18,7 +18,7 @@
 
 from __future__ import absolute_import
 
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import exceptions
 
diff --git a/openstack_dashboard/test/error_pages_urls.py b/openstack_dashboard/test/error_pages_urls.py
index 2222010699..5f2b9f3c46 100644
--- a/openstack_dashboard/test/error_pages_urls.py
+++ b/openstack_dashboard/test/error_pages_urls.py
@@ -13,6 +13,6 @@
 from django.conf.urls import url
 from django.views import defaults
 
-from openstack_dashboard.urls import urlpatterns  # noqa
+from openstack_dashboard.urls import urlpatterns
 
 urlpatterns.append(url(r'^500/$', defaults.server_error))
diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py
index 2dc2c4f8cb..dcd72fc6da 100644
--- a/openstack_dashboard/test/helpers.py
+++ b/openstack_dashboard/test/helpers.py
@@ -18,17 +18,17 @@
 
 import collections
 import copy
-from functools import wraps  # noqa
+from functools import wraps
 import os
 import traceback
 import unittest
 
 import django
 from django.conf import settings
-from django.contrib.messages.storage import default_storage  # noqa
+from django.contrib.messages.storage import default_storage
 from django.core.handlers import wsgi
 from django.core import urlresolvers
-from django.test.client import RequestFactory  # noqa
+from django.test.client import RequestFactory
 from django.test import utils as django_test_utils
 from django.utils import http
 
diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py
index b1a17dc5a1..2a37f20996 100644
--- a/openstack_dashboard/test/test_data/keystone_data.py
+++ b/openstack_dashboard/test/test_data/keystone_data.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import copy
-from datetime import timedelta  # noqa
+from datetime import timedelta
 
 from django.conf import settings
 from django.utils import datetime_safe
diff --git a/openstack_dashboard/test/tests/quotas.py b/openstack_dashboard/test/tests/quotas.py
index 550f4f6ae2..624a5fce54 100644
--- a/openstack_dashboard/test/tests/quotas.py
+++ b/openstack_dashboard/test/tests/quotas.py
@@ -22,7 +22,7 @@ from __future__ import absolute_import
 from django import http
 from django.test.utils import override_settings
 from django.utils.translation import ugettext_lazy as _
-from mox3.mox import IsA  # noqa
+from mox3.mox import IsA
 
 from horizon import exceptions
 from openstack_dashboard import api
diff --git a/openstack_dashboard/test/urls.py b/openstack_dashboard/test/urls.py
index 0aa7c6043c..cc3a73d15d 100644
--- a/openstack_dashboard/test/urls.py
+++ b/openstack_dashboard/test/urls.py
@@ -19,9 +19,9 @@ URL patterns for the OpenStack Dashboard.
 
 from django.conf import settings
 from django.conf.urls import include
-from django.conf.urls.static import static  # noqa
+from django.conf.urls.static import static
 from django.conf.urls import url
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns  # noqa
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import defaults
 
 from openstack_dashboard.api import rest
diff --git a/openstack_dashboard/urls.py b/openstack_dashboard/urls.py
index 67717c1f5c..1992239259 100644
--- a/openstack_dashboard/urls.py
+++ b/openstack_dashboard/urls.py
@@ -22,9 +22,9 @@ URL patterns for the OpenStack Dashboard.
 
 from django.conf import settings
 from django.conf.urls import include
-from django.conf.urls.static import static  # noqa
+from django.conf.urls.static import static
 from django.conf.urls import url
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns  # noqa
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import defaults
 
 import horizon
diff --git a/openstack_dashboard/usage/__init__.py b/openstack_dashboard/usage/__init__.py
index 028fd96f87..063c27dd34 100644
--- a/openstack_dashboard/usage/__init__.py
+++ b/openstack_dashboard/usage/__init__.py
@@ -12,12 +12,21 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# Importing non-modules that are not used explicitly
+from openstack_dashboard.usage.base import BaseUsage
+from openstack_dashboard.usage.base import GlobalUsage
+from openstack_dashboard.usage.base import ProjectUsage
+from openstack_dashboard.usage.tables import BaseUsageTable
+from openstack_dashboard.usage.tables import GlobalUsageTable
+from openstack_dashboard.usage.tables import ProjectUsageTable
+from openstack_dashboard.usage.views import UsageView
 
-from openstack_dashboard.usage.base import BaseUsage  # noqa
-from openstack_dashboard.usage.base import GlobalUsage  # noqa
-from openstack_dashboard.usage.base import ProjectUsage  # noqa
-from openstack_dashboard.usage.tables import BaseUsageTable  # noqa
-from openstack_dashboard.usage.tables import GlobalUsageTable  # noqa
-from openstack_dashboard.usage.tables import ProjectUsageTable  # noqa
-from openstack_dashboard.usage.views import UsageView  # noqa
+
+__all__ = [
+    'BaseUsage',
+    'GlobalUsage',
+    'ProjectUsage',
+    'BaseUsageTable',
+    'GlobalUsageTable',
+    'ProjectUsageTable',
+    'UsageView',
+]
diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py
index 1db06ccdd7..794f7ff2bf 100644
--- a/openstack_dashboard/usage/quotas.py
+++ b/openstack_dashboard/usage/quotas.py
@@ -17,7 +17,7 @@ import logging
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions
-from horizon.utils.memoized import memoized  # noqa
+from horizon.utils.memoized import memoized
 
 from openstack_dashboard.api import base
 from openstack_dashboard.api import cinder
diff --git a/openstack_dashboard/usage/tables.py b/openstack_dashboard/usage/tables.py
index 796455ddaa..e2b74144d3 100644
--- a/openstack_dashboard/usage/tables.py
+++ b/openstack_dashboard/usage/tables.py
@@ -11,7 +11,7 @@
 # under the License.
 
 from django.core import urlresolvers
-from django.template.defaultfilters import floatformat  # noqa
+from django.template.defaultfilters import floatformat
 from django.utils.translation import ugettext_lazy as _
 
 from horizon import tables