diff --git a/doc/conf.py b/doc/conf.py
index 07f5e996b7964476cb7bbd94bcff6b50e2ea2e64..cf87d3ab33d87aa3564c074bf768528168a4c4e2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -229,12 +229,12 @@ rst_epilog = """
 # Default processing flags for sphinx
 autoclass_content = 'class'
 autodoc_member_order = 'bysource'
-autodoc_default_flags = [
-  'members',
-  'undoc-members',
-  'inherited-members',
-  'show-inheritance',
-  ]
+autodoc_default_options = {
+  "members": True,
+  "undoc-members": True,
+  "inherited-members": True,
+  "show-inheritance": True,
+}
 
 # For inter-documentation mapping:
 from bob.extension.utils import link_documentation, load_requirements
@@ -248,23 +248,4 @@ else:
   intersphinx_mapping = link_documentation()
 
 
-# We want to remove all private (i.e. _. or __.__) members
-# that are not in the list of accepted functions
-accepted_private_functions = ['__array__']
-
-def member_function_test(app, what, name, obj, skip, options):
-  # test if we have a private function
-  if len(name) > 1 and name[0] == '_':
-    # test if this private function should be allowed
-    if name not in accepted_private_functions:
-      # omit privat functions that are not in the list of accepted private functions
-      return skip
-    else:
-      # test if the method is documented
-      if not hasattr(obj, '__doc__') or not obj.__doc__:
-        return skip
-  return False
-
-def setup(app):
-  app.connect('autodoc-skip-member', member_function_test)