diff --git a/cinder/__init__.py b/cinder/__init__.py
index 2b43c2faf..0712b0b63 100644
--- a/cinder/__init__.py
+++ b/cinder/__init__.py
@@ -21,10 +21,4 @@
 .. automodule:: cinder
    :platform: Unix
    :synopsis: Infrastructure-as-a-Service Cloud platform.
-.. moduleauthor:: Jesse Andrews <jesse@ansolabs.com>
-.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
-.. moduleauthor:: Vishvananda Ishaya <vishvananda@gmail.com>
-.. moduleauthor:: Joshua McKenty <joshua@cognition.ca>
-.. moduleauthor:: Manish Singh <yosh@gimp.org>
-.. moduleauthor:: Andy Smith <andy@anarkystic.com>
 """
diff --git a/cinder/scheduler/__init__.py b/cinder/scheduler/__init__.py
index a81012199..63a101bf8 100644
--- a/cinder/scheduler/__init__.py
+++ b/cinder/scheduler/__init__.py
@@ -19,7 +19,4 @@
 .. automodule:: cinder.scheduler
    :platform: Unix
    :synopsis: Module that picks a volume node to create a volume.
-.. moduleauthor:: Sandy Walsh <sandy.walsh@rackspace.com>
-.. moduleauthor:: Ed Leafe <ed@leafe.com>
-.. moduleauthor:: Chris Behrens <cbehrens@codestud.com>
 """
diff --git a/cinder/tests/unit/__init__.py b/cinder/tests/unit/__init__.py
index f59fa3d6e..1b5ffcd9a 100644
--- a/cinder/tests/unit/__init__.py
+++ b/cinder/tests/unit/__init__.py
@@ -20,12 +20,6 @@
 
 .. automodule:: cinder.tests.unit
    :platform: Unix
-.. moduleauthor:: Jesse Andrews <jesse@ansolabs.com>
-.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
-.. moduleauthor:: Vishvananda Ishaya <vishvananda@gmail.com>
-.. moduleauthor:: Joshua McKenty <joshua@cognition.ca>
-.. moduleauthor:: Manish Singh <yosh@gimp.org>
-.. moduleauthor:: Andy Smith <andy@anarkystic.com>
 """
 
 import eventlet
diff --git a/tox.ini b/tox.ini
index 3a6ac79a1..fb71b5829 100644
--- a/tox.ini
+++ b/tox.ini
@@ -121,18 +121,7 @@ commands = bandit -c tools/bandit.yaml -r cinder -n 5 -ll
 #
 # E251 unexpected spaces around keyword / parameter equals
 # reason: no improvement in readability
-#
-# Due to the upgrade to hacking 0.9.2 the following checking are
-# ignored on purpose for the moment and should be re-enabled.
-#
-# H405
-# Due to the upgrade to hacking 0.10.0 the following checking are
-# ignored on purpose for the moment and should be cleaned up and re-enabled.
-#
-#  H105  Don't use author tags
-#
-
-ignore = E251,H105
+ignore = E251
 exclude = .git,.venv,.tox,dist,tools,doc,common,*egg,build
 max-complexity=30