diff --git a/manila/api/v1/share_networks.py b/manila/api/v1/share_networks.py
index fedbe04daf..cce603bedf 100644
--- a/manila/api/v1/share_networks.py
+++ b/manila/api/v1/share_networks.py
@@ -26,7 +26,6 @@ from manila.api import xmlutil
 from manila.common import constants
 from manila.db import api as db_api
 from manila import exception
-from manila import network
 from manila.openstack.common import importutils
 from manila.openstack.common import log as logging
 from manila import policy
diff --git a/manila/scheduler/simple.py b/manila/scheduler/simple.py
index 7449d3574e..572f950de7 100644
--- a/manila/scheduler/simple.py
+++ b/manila/scheduler/simple.py
@@ -71,8 +71,8 @@ class SimpleScheduler(chance.ChanceScheduler):
 
         results = db.service_get_all_share_sorted(elevated)
         if zone:
-            results = [(service, gigs) for (service, gigs) in results
-                       if service['availability_zone'] == zone]
+            results = [(service_g, gigs) for (service_g, gigs) in results
+                       if service_g['availability_zone'] == zone]
         for result in results:
             (service, share_gigabytes) = result
             if share_gigabytes + share_size > CONF.max_gigabytes:
diff --git a/tox.ini b/tox.ini
index 33d0088eda..786c4fae4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,6 @@ commands = bash tools/lintstack.sh
 # TODO: These are not intentionally disabled, reenable when fixed:
 # H405: multi line docstring summary not separated with an empty line
 # H501: Do not use locals() for string formatting
-ignore = E12,H302,H303,H402,H404,H405,H501,H904,F401,F403,F811,F812,F841
+ignore = E12,H302,H303,H402,H404,H405,H501,H904,F401,F403,F841
 builtins = _
 exclude = .venv,.tox,dist,doc,openstack,*egg