diff --git a/doc/source/index.rst b/doc/source/index.rst
index 4e630a5ee4..22ed0d0aa8 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -222,11 +222,7 @@ Module Reference
 .. toctree::
    :hidden:
 
-   api/autoindex
-
 Indices and tables
 ==================
 
-* :ref:`genindex`
-* :ref:`modindex`
 * :ref:`search`
diff --git a/setup.cfg b/setup.cfg
index ecc2948db9..120d41b9a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -234,14 +234,6 @@ output_file = nova/locale/nova.pot
 universal = 1
 
 [pbr]
-# Have pbr generate the module indexes like sphinx autodoc
-autodoc_index_modules = True
-
-# Exclude modules that won't build with autodoc (or that we don't want doc'ed);
-# this requires updating the exclude_patterns variable in doc/source/conf.py
-autodoc_exclude_modules = nova.wsgi.nova-*
-                          nova.tests.*
-
 # Treat sphinx warnings as errors during the docs build; this helps us keep
 # the documentation clean.
 warnerrors = true