diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4ee205fb1..f23b57bbc 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -10,9 +10,6 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# Zaqar documentation build configuration file, created by
-# sphinx-quickstart on Sat May  1 15:17:47 2010.
 #
 # This file is execfile()d with the current directory set
 # to its containing dir.
@@ -52,16 +49,6 @@ extensions = ['sphinx.ext.autodoc',
 
 todo_include_todos = True
 
-# Add any paths that contain templates here, relative to this directory.
-# Changing the path so that the Hudson build output contains GA code
-# and the source docs do not contain the code so local, offline sphinx builds
-# are "clean."
-templates_path = []
-if os.getenv('HUDSON_PUBLISH_DOCS'):
-    templates_path = ['_ga', '_templates']
-else:
-    templates_path = ['_templates']
-
 # The suffix of source filenames.
 source_suffix = '.rst'
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 2e88337fa..18dda4be8 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -11,9 +11,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Zaqar Release Notes documentation build configuration file, created by
-# sphinx-quickstart on Tue Nov  4 13:44:05 2015.
-#
 # This file is execfile()d with the current directory set to its
 # containing dir.
 #
@@ -140,7 +137,7 @@ html_theme = 'openstackdocs'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied