diff --git a/.mailmap b/.mailmap
index f4f433092..e42fc43ff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@
 <yorik.sar@gmail.com> <yorik@ytaraday>
 <jeblair@hp.com> <james.blair@rackspace.com>
 <ke.wu@ibeca.me> <ke.wu@nebula.com>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
diff --git a/horizon/middleware.py b/horizon/middleware.py
index edd4359fc..2775bcab0 100644
--- a/horizon/middleware.py
+++ b/horizon/middleware.py
@@ -30,7 +30,6 @@ from django.conf import settings
 from django.contrib import messages as django_messages
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.views import redirect_to_login
-from django.core.urlresolvers import reverse
 from django.utils import timezone
 from django.utils.encoding import iri_to_uri
 
diff --git a/horizon/tables/actions.py b/horizon/tables/actions.py
index 9bc601d9a..920a61574 100644
--- a/horizon/tables/actions.py
+++ b/horizon/tables/actions.py
@@ -21,7 +21,7 @@ from django import shortcuts
 from django.conf import settings
 from django.core import urlresolvers
 from django.utils.functional import Promise
-from django.utils.translation import string_concat, ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from horizon import exceptions
 from horizon import messages
diff --git a/horizon/utils/secret_key.py b/horizon/utils/secret_key.py
index 6eba25ebf..c45091382 100644
--- a/horizon/utils/secret_key.py
+++ b/horizon/utils/secret_key.py
@@ -20,7 +20,6 @@ from __future__ import with_statement  # Python 2.5 compliance
 import lockfile
 import random
 import string
-import tempfile
 import os
 
 
diff --git a/openstack_dashboard/dashboards/admin/flavors/extras/tables.py b/openstack_dashboard/dashboards/admin/flavors/extras/tables.py
index abb325a57..f8f8e07a8 100644
--- a/openstack_dashboard/dashboards/admin/flavors/extras/tables.py
+++ b/openstack_dashboard/dashboards/admin/flavors/extras/tables.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import logging
-import re
 
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
diff --git a/openstack_dashboard/dashboards/admin/flavors/tests.py b/openstack_dashboard/dashboards/admin/flavors/tests.py
index f4d3ca475..82e3937da 100644
--- a/openstack_dashboard/dashboards/admin/flavors/tests.py
+++ b/openstack_dashboard/dashboards/admin/flavors/tests.py
@@ -1,5 +1,3 @@
-import uuid
-
 from django import http
 from django.core.urlresolvers import reverse
 from mox import IsA
diff --git a/openstack_dashboard/test/error_pages_urls.py b/openstack_dashboard/test/error_pages_urls.py
index cc28840bd..c9f18178a 100644
--- a/openstack_dashboard/test/error_pages_urls.py
+++ b/openstack_dashboard/test/error_pages_urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import patterns
 
 from openstack_dashboard.urls import urlpatterns
 
diff --git a/openstack_dashboard/test/tests/error_pages.py b/openstack_dashboard/test/tests/error_pages.py
index 44cb8da5a..a889605e1 100644
--- a/openstack_dashboard/test/tests/error_pages.py
+++ b/openstack_dashboard/test/tests/error_pages.py
@@ -19,7 +19,6 @@ from os import path
 
 from django.conf import settings
 
-from horizon import exceptions
 from openstack_dashboard.test import helpers as test