diff --git a/openerp/.apidoc b/openerp/.apidoc
deleted file mode 100644
index 9109e4388fe..00000000000
--- a/openerp/.apidoc
+++ /dev/null
@@ -1 +0,0 @@
-excludes: pychart release openerp-server test run_tests addons/base_quality_interrogation
\ No newline at end of file
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index d6f9dc49d84..5280531b0f1 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -20,8 +20,6 @@
 #
 ##############################################################################
 
-#.apidoc title: Common Services: netsvc
-#.apidoc module-mods: member-order: bysource
 
 import errno
 import logging
diff --git a/openerp/osv/__init__.py b/openerp/osv/__init__.py
index b32d81d659e..630090954e6 100644
--- a/openerp/osv/__init__.py
+++ b/openerp/osv/__init__.py
@@ -22,7 +22,6 @@
 import osv
 import fields
 
-#.apidoc title: Object Services and Relational Mapping
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py
index 899279c8015..6989be2ccb3 100644
--- a/openerp/osv/expression.py
+++ b/openerp/osv/expression.py
@@ -141,7 +141,6 @@ from openerp.osv import fields
 from openerp.osv.orm import MAGIC_COLUMNS
 import openerp.tools as tools
 
-#.apidoc title: Domain Expressions
 
 # Domain operators.
 NOT_OPERATOR = '!'
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 8a432240567..8e0c6c7376a 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-#.apidoc title: Object Relational Mapping
-#.apidoc module-mods: member-order: bysource
 
 """
   Object relational mapping to database (postgresql) module
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 018976ac663..b7742169f2f 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-#.apidoc title: Objects Services (OSV)
 
 from functools import wraps
 import logging
diff --git a/openerp/osv/query.py b/openerp/osv/query.py
index 04a0ec5509b..8ddce368220 100644
--- a/openerp/osv/query.py
+++ b/openerp/osv/query.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-#.apidoc title: Query object
 
 
 def _quote(to_quote):
diff --git a/openerp/report/__init__.py b/openerp/report/__init__.py
index 48b654fdd86..6b56f15b6b5 100644
--- a/openerp/report/__init__.py
+++ b/openerp/report/__init__.py
@@ -30,7 +30,6 @@ import report_sxw
 
 import printscreen
 
-#.apidoc title: Reporting Support and Engines
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/printscreen/__init__.py b/openerp/report/printscreen/__init__.py
index e940a7e467c..deb270b561b 100644
--- a/openerp/report/printscreen/__init__.py
+++ b/openerp/report/printscreen/__init__.py
@@ -22,7 +22,6 @@
 import ps_list
 import ps_form
 
-#.apidoc title: Printscreen Support
 
 """ A special report, that is automatically formatted to look like the
     screen contents of Form/List Views.
diff --git a/openerp/report/printscreen/ps_form.py b/openerp/report/printscreen/ps_form.py
index 299e0466d8f..e585176d515 100644
--- a/openerp/report/printscreen/ps_form.py
+++ b/openerp/report/printscreen/ps_form.py
@@ -28,7 +28,6 @@ from lxml import etree
 
 import time, os
 
-#.apidoc title: Printscreen for Form Views
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py
index 51882b6c81a..c26597c8cdf 100644
--- a/openerp/report/printscreen/ps_list.py
+++ b/openerp/report/printscreen/ps_list.py
@@ -31,7 +31,6 @@ import time, os
 from operator import itemgetter
 from datetime import datetime
 
-#.apidoc title: Printscreen for List Views
 
 class report_printscreen_list(report_int):
     def __init__(self, name):
diff --git a/openerp/report/pyPdf/__init__.py b/openerp/report/pyPdf/__init__.py
index 9e4f84d3863..e6fe66e1b6a 100644
--- a/openerp/report/pyPdf/__init__.py
+++ b/openerp/report/pyPdf/__init__.py
@@ -1,5 +1,4 @@
 from pdf import PdfFileReader, PdfFileWriter
-#.apidoc title: pyPdf Engine
 
 __all__ = ["pdf"]
 
diff --git a/openerp/report/render/__init__.py b/openerp/report/render/__init__.py
index 89432fa9bdd..6f31e560973 100644
--- a/openerp/report/render/__init__.py
+++ b/openerp/report/render/__init__.py
@@ -23,7 +23,6 @@ from simple import simple
 from rml import rml, rml2html, rml2txt, odt2odt , html2html, makohtml2html
 from render import render
 
-#.apidoc title: Report Rendering
 
 try:
     from PIL import Image
diff --git a/openerp/report/render/html2html/__init__.py b/openerp/report/render/html2html/__init__.py
index 40917030f45..ac040a37989 100644
--- a/openerp/report/render/html2html/__init__.py
+++ b/openerp/report/render/html2html/__init__.py
@@ -21,7 +21,6 @@
 
 from html2html import parseString
 
-#.apidoc title: HTML to HTML engine
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/render/makohtml2html/__init__.py b/openerp/report/render/makohtml2html/__init__.py
index 8ce38649762..d5e97470556 100644
--- a/openerp/report/render/makohtml2html/__init__.py
+++ b/openerp/report/render/makohtml2html/__init__.py
@@ -21,7 +21,6 @@
 
 from makohtml2html import parseNode
 
-#.apidoc title: MAKO to HTML engine
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/odt2odt/__init__.py b/openerp/report/render/odt2odt/__init__.py
index 7155923b6b6..a0d2126ee35 100644
--- a/openerp/report/render/odt2odt/__init__.py
+++ b/openerp/report/render/odt2odt/__init__.py
@@ -21,6 +21,5 @@
 
 from odt2odt import parseNode
 
-#.apidoc title: ODT to ODT engine
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/openerp/report/render/rml2html/__init__.py b/openerp/report/render/rml2html/__init__.py
index 96b9afc6e70..8bb6fbb507b 100644
--- a/openerp/report/render/rml2html/__init__.py
+++ b/openerp/report/render/rml2html/__init__.py
@@ -21,7 +21,6 @@
 
 from rml2html import parseString
 
-#.apidoc title: RML to HTML engine
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/report/render/rml2pdf/__init__.py b/openerp/report/render/rml2pdf/__init__.py
index fdbb5f77b89..cc5c898bbf7 100644
--- a/openerp/report/render/rml2pdf/__init__.py
+++ b/openerp/report/render/rml2pdf/__init__.py
@@ -21,7 +21,6 @@
 
 from trml2pdf import parseString, parseNode
 
-#.apidoc title: RML to PDF engine
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/report/render/rml2pdf/customfonts.py b/openerp/report/render/rml2pdf/customfonts.py
index ff46018a5e5..0c0095b8818 100644
--- a/openerp/report/render/rml2pdf/customfonts.py
+++ b/openerp/report/render/rml2pdf/customfonts.py
@@ -28,7 +28,6 @@ from reportlab import rl_config
 
 from openerp.tools import config
 
-#.apidoc title: TTF Font Table
 
 """This module allows the mapping of some system-available TTF fonts to
 the reportlab engine.
diff --git a/openerp/report/render/rml2txt/__init__.py b/openerp/report/render/rml2txt/__init__.py
index cc0530eedb6..c80d8376272 100644
--- a/openerp/report/render/rml2txt/__init__.py
+++ b/openerp/report/render/rml2txt/__init__.py
@@ -21,7 +21,6 @@
 
 from rml2txt import parseString, parseNode
 
-#.apidoc title: RML to TXT engine
 
 """ This engine is the minimalistic renderer of RML documents into text files,
     using spaces and newlines to format.
diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index bb37cf2cf4f..16a8596cb6f 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -40,7 +40,6 @@ import openerp.osv
 from openerp.release import nt_service_name
 import openerp.tools
 
-#.apidoc title: RPC Services
 
 """ Classes of this module implement the network protocols that the
     OpenERP server uses to communicate with remote clients.
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 6134f75f93e..63e8ce8338e 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -26,7 +26,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 
-#.apidoc title: HTTP and XML-RPC Server
 
 """ This module offers the family of HTTP-based servers. These are not a single
     class/functionality, but a set of network stack layers, implementing
diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py
index af89a734f28..b3f37bd771d 100644
--- a/openerp/service/netrpc_server.py
+++ b/openerp/service/netrpc_server.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-#.apidoc title: NET-RPC Server
 
 """ This file contains instance of the net-rpc server
 """
diff --git a/openerp/service/security.py b/openerp/service/security.py
index d327efe5443..849796da8bf 100644
--- a/openerp/service/security.py
+++ b/openerp/service/security.py
@@ -23,7 +23,6 @@ import openerp.exceptions
 import openerp.pooler as pooler
 import openerp.tools as tools
 
-#.apidoc title: Authentication helpers
 
 def login(db, login, password):
     pool = pooler.get_pool(db)
diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index 940ecdb23e8..c11b1fc74b8 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -43,8 +43,6 @@ import openerp.exceptions
 from openerp.service import http_server
 from openerp import SUPERUSER_ID
 
-#.apidoc title: Exported Service methods
-#.apidoc module-mods: member-order: bysource
 
 """ This python module defines the RPC methods available to remote clients.
 
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 2ce6d3fa09d..7767cff2b30 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -24,7 +24,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 ###############################################################################
 
-#.apidoc title: HTTP Layer library (websrv_lib)
 
 """ Framework for generic http servers
 
diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 337964f3368..77c873b3482 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-#.apidoc title: PostgreSQL interface
 
 """
 The PostgreSQL connector is a connectivity layer between the OpenERP code and
@@ -30,8 +29,6 @@ the ORM does, in fact.
 See also: the `pooler` module
 """
 
-#.apidoc add-functions: print_stats
-#.apidoc add-classes: Cursor Connection ConnectionPool
 
 __all__ = ['db_connect', 'close_db']
 
diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index af14189bbae..18dab088440 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -35,7 +35,6 @@ from sql import *
 from float_utils import *
 from mail import *
 
-#.apidoc title: Tools
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index bca0f8dc603..3b04881048c 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -47,7 +47,6 @@ class MyOption (optparse.Option, object):
         self.my_default = attrs.pop('my_default', None)
         super(MyOption, self).__init__(*opts, **attrs)
 
-#.apidoc title: Server Configuration Loader
 
 def check_ssl():
     try:
diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index 47a2ae4faac..c145209e2f1 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -20,7 +20,6 @@
 #
 ##############################################################################
 
-#.apidoc title: Utilities: tools.misc
 
 """
 Miscellaneous tools used by OpenERP.
diff --git a/openerp/workflow/__init__.py b/openerp/workflow/__init__.py
index 959a878f208..87622df7be6 100644
--- a/openerp/workflow/__init__.py
+++ b/openerp/workflow/__init__.py
@@ -21,7 +21,6 @@
 
 import wkf_service
 
-#.apidoc title: Workflow objects
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: