diff --git a/doc/conf.py b/doc/conf.py
index 0167cb90..078279d4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -39,8 +39,6 @@ except ImportError:
 
 print "sys.path:", sys.path
 
-#sys.path.insert(0, os.getcwd() + "/..")
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -48,7 +46,6 @@ print "sys.path:", sys.path
 
 #print "sys.path.after:", sys.path
 
-
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
 # absolute, like shown here.
@@ -57,7 +54,6 @@ sys.path.append(os.path.abspath('sphinxext'))
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
 #sys.path.insert(0, os.path.abspath('./sphinxext'))
 
 # -- General configuration -----------------------------------------------------
@@ -76,9 +72,6 @@ extensions = ['sphinx.ext.autodoc',
               'ipython_directive',
               'ipython_console_highlighting'
               #'matplotlib.sphinxext.plot_directive'
-              #'mathmpl',
-              #'only_directives',
-              #'plot_directive'
              ]
 plot_formats = [('png', 80), ('pdf', 50)]
 
@@ -120,7 +113,6 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 on_rtd = True
 if on_rtd:
-    print "I am here"
     sys.path.append(os.path.abspath('../GPy'))
 
     import subprocess
@@ -134,15 +126,12 @@ if on_rtd:
     proc = subprocess.Popen("sphinx-apidoc -f -o . ../GPy", stdout=subprocess.PIPE, shell=True)
     (out, err) = proc.communicate()
     print "program output:", out
-    proc = subprocess.Popen("whereis numpy", stdout=subprocess.PIPE, shell=True)
-    (out, err) = proc.communicate()
-    print "program output:", out
-    print "MATPLOTLIB BABY"
-    proc = subprocess.Popen("whereis matplotlib", stdout=subprocess.PIPE, shell=True)
-    (out, err) = proc.communicate()
-    print "program output:", out
-    #os.system("cd ..")
-    #os.system("cd ./docs")
+    #proc = subprocess.Popen("whereis numpy", stdout=subprocess.PIPE, shell=True)
+    #(out, err) = proc.communicate()
+    #print "program output:", out
+    #proc = subprocess.Popen("whereis matplotlib", stdout=subprocess.PIPE, shell=True)
+    #(out, err) = proc.communicate()
+    #print "program output:", out
 
 print "Compiled files"
 
@@ -406,17 +395,4 @@ epub_copyright = u'2013, Author'
 # Allow duplicate toc entries.
 #epub_tocdup = True
 
-#############################################################################
-#
-# Include constructors in all the docs
-# Got this method from:
-# http://stackoverflow.com/questions/5599254/how-to-use-sphinxs-autodoc-to-document-a-classs-init-self-method
-#def skip(app, what, name, obj, skip, options):
-    #if name == "__init__":
-        #return False
-    #return skip
-
-#def setup(app):
-    #app.connect("autodoc-skip-member", skip)
-
 autodoc_member_order = "source"
diff --git a/doc/tuto_GP_regression.rst b/doc/tuto_GP_regression.rst
index 2e307287..92b25bc0 100644
--- a/doc/tuto_GP_regression.rst
+++ b/doc/tuto_GP_regression.rst
@@ -2,22 +2,6 @@
 Gaussian process regression tutorial
 *************************************
 
-.. ipython:: python
-
-    print "Hello world"
-    X = [[1, 10], [1, 20], [1, -2]]
-
-.. plot::
-
-    import matplotlib.pyplot as plt
-    import numpy as np
-    x = np.random.randn(1000)
-    plt.hist( x, 20)
-    plt.grid()
-    plt.title(r'Normal: $\mu=%.2f, \sigma=%.2f$'%(x.mean(), x.std()))
-    plt.show()
-
-
 We will see in this tutorial the basics for building a 1 dimensional and a 2 dimensional Gaussian process regression model, also known as a kriging model.
 
 We first import the libraries we will need: ::