diff --git a/nova/__init__.py b/nova/__init__.py
index 1dc04336d55a..a9eca4848caf 100644
--- a/nova/__init__.py
+++ b/nova/__init__.py
@@ -23,12 +23,6 @@
 .. automodule:: nova
    :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>
 """
 
 import gettext
diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py
index 3d683a0e2c03..ee569500b4a8 100644
--- a/nova/cloudpipe/__init__.py
+++ b/nova/cloudpipe/__init__.py
@@ -23,7 +23,4 @@
 .. automodule:: nova.cloudpipe
    :platform: Unix
    :synopsis: An OpenVPN server for every nova user.
-.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
-.. moduleauthor:: Vishvananda Ishaya <vishvananda@gmail.com>
-.. moduleauthor:: Joshua McKenty <jmckenty@gmail.com>
 """
diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py
index f423f88452cf..9fe102ba9dde 100644
--- a/nova/objectstore/__init__.py
+++ b/nova/objectstore/__init__.py
@@ -23,10 +23,4 @@
 .. automodule:: nova.objectstore
    :platform: Unix
    :synopsis: Currently a trivial file-based system, getting extended w/ swift.
-.. 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/nova/tests/__init__.py b/nova/tests/__init__.py
index e438e1d64f7c..ee2d17afa688 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -22,12 +22,6 @@
 
 .. automodule:: nova.tests
    :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>
 """
 
 # See http://code.google.com/p/python-nose/issues/detail?id=373
diff --git a/smoketests/__init__.py b/smoketests/__init__.py
index dbc926f1e38e..67609d4249f0 100644
--- a/smoketests/__init__.py
+++ b/smoketests/__init__.py
@@ -22,10 +22,4 @@
 
 .. automodule:: nova.volume
    :platform: Unix
-.. moduleauthor:: Jesse Andrews <jesse@ansolabs.com>
-.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
-.. moduleauthor:: Vishvananda Ishaya <vishvananda@yahoo.com>
-.. moduleauthor:: Joshua McKenty <joshua@cognition.ca>
-.. moduleauthor:: Manish Singh <yosh@gimp.org>
-.. moduleauthor:: Andy Smith <andy@anarkystic.com>
 """