diff --git a/doc/tools/apigen.py b/doc/tools/apigen.py
index 7e306dd8..f13f2a1b 100644
--- a/doc/tools/apigen.py
+++ b/doc/tools/apigen.py
@@ -269,10 +269,6 @@ class ApiDocWriter(object):
 
         ad = '.. AUTO-GENERATED FILE -- DO NOT EDIT!\n\n'
 
-        chap_title = uri_short
-        #ad += (chap_title+'\n'+ self.rst_section_levels[1] * len(chap_title)
-        #       + '\n\n')
-
         # Set the chapter title to read 'module' for all modules except for the
         # main packages
         if '.' in uri:
@@ -283,14 +279,6 @@ class ApiDocWriter(object):
 
         ad += '\n.. automodule:: ' + uri + '\n'
         ad += '\n.. currentmodule:: ' + uri + '\n'
-#        multi_class = len(classes) > 1
-#        multi_fx = len(functions) > 1
-#        if multi_class:
-#            ad += '\n' + 'Classes' + '\n' + \
-#                  self.rst_section_levels[2] * 7 + '\n'
-#        elif len(classes) and multi_fx:
-#            ad += '\n' + 'Class' + '\n' + \
-#                  self.rst_section_levels[2] * 5 + '\n'
         for c in classes:
             ad += '\n:class:`' + c + '`\n' \
                   + self.rst_section_levels[2] * \
@@ -302,12 +290,6 @@ class ApiDocWriter(object):
                   '  :show-inheritance:\n' \
                   '\n' \
                   '  .. automethod:: __init__\n'
-#        if multi_fx:
-#        ad += '\n' + 'Functions' + '\n' + \
-#              self.rst_section_levels[2] * 9 + '\n\n'
-#        elif len(functions) and multi_class:
-#            ad += '\n' + 'Function' + '\n' + \
-#                  self.rst_section_levels[2] * 8 + '\n\n'
         ad += '.. autosummary::\n\n'
         for f in functions:
             ad += '   ' + uri + '.' + f + '\n'