diff --git a/doc/source/conf.py b/doc/source/conf.py
index e023b70c..72f7d212 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -30,30 +30,30 @@ import shlex
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinx.ext.autodoc',
+    #'sphinx.ext.autodoc',
     'sphinx.ext.coverage',
     'sphinx.ext.mathjax',
     'sphinx.ext.viewcode',
 ]
 
 #----- Autodoc
-import sys
-try:
-    from unittest.mock import MagicMock
-except:
-    from mock import Mock as MagicMock
-
-class Mock(MagicMock):
-    @classmethod
-    def __getattr__(cls, name):
-            return Mock()
-
-MOCK_MODULES = ['scipy.linalg.blas', 'blas', 'scipy.optimize', 'scipy.optimize.linesearch', 'scipy.linalg', 'scipy', 'scipy.special', 'scipy.integrate', 'scipy.io', 'scipy.stats', 'GPy.util.choleskies_cython',
-                'sympy', 'sympy.utilities.iterables', 'sympy.utilities.lambdify', 'sympy.utilities', 'sympy.utilities.codegen', 'sympy.core.cache', 'sympy.core', 'sympy.parsing', 'sympy.parsing.sympy_parser',
-                'nose', 'nose.tools']
-
-sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
-
+#import sys
+#try:
+#    from unittest.mock import MagicMock
+#except:
+#    from mock import Mock as MagicMock
+#
+#class Mock(MagicMock):
+#    @classmethod
+#    def __getattr__(cls, name):
+#            return Mock()
+#
+#MOCK_MODULES = ['scipy.linalg.blas', 'blas', 'scipy.optimize', 'scipy.optimize.linesearch', 'scipy.linalg', 'scipy', 'scipy.special', 'scipy.integrate', 'scipy.io', 'scipy.stats', 'GPy.util.choleskies_cython',
+#                'sympy', 'sympy.utilities.iterables', 'sympy.utilities.lambdify', 'sympy.utilities', 'sympy.utilities.codegen', 'sympy.core.cache', 'sympy.core', 'sympy.parsing', 'sympy.parsing.sympy_parser',
+#                'nose', 'nose.tools']
+#
+#sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
+#
 import sphinx_rtd_theme
 
 autodoc_default_flags = ['members',
@@ -65,7 +65,7 @@ autodoc_default_flags = ['members',
 autodoc_member_order = 'groupwise'
 add_function_parentheses = False
 add_module_names = False
-modindex_common_prefix = ['GPy.']
+modindex_common_prefix = ['GPy']
 show_authors = True
 
 # ------ Sphinx