diff --git a/GPy/inference/latent_function_inference/var_dtc.py b/GPy/inference/latent_function_inference/var_dtc.py
index 1cabecc3..0459132a 100644
--- a/GPy/inference/latent_function_inference/var_dtc.py
+++ b/GPy/inference/latent_function_inference/var_dtc.py
@@ -167,6 +167,7 @@ class VarDTC(LatentFunctionInference):
             woodbury_vector = Cpsi1Vf # == Cpsi1V
         else:
             print 'foobar'
+            stop
             psi1V = np.dot(Y.T*beta, psi1).T
             tmp, _ = dtrtrs(Lm, psi1V, lower=1, trans=0)
             tmp, _ = dpotrs(LB, tmp, lower=1)
diff --git a/GPy/inference/optimization/hmc.py b/GPy/inference/mcmc/hmc.py
similarity index 100%
rename from GPy/inference/optimization/hmc.py
rename to GPy/inference/mcmc/hmc.py
diff --git a/GPy/inference/optimization/samplers.py b/GPy/inference/mcmc/samplers.py
similarity index 100%
rename from GPy/inference/optimization/samplers.py
rename to GPy/inference/mcmc/samplers.py
diff --git a/doc/GPy.inference.optimization.rst b/doc/GPy.inference.optimization.rst
index 83339202..81fa877a 100644
--- a/doc/GPy.inference.optimization.rst
+++ b/doc/GPy.inference.optimization.rst
@@ -68,6 +68,14 @@ GPy.inference.optimization.sgd module
     :undoc-members:
     :show-inheritance:
 
+GPy.inference.optimization.stochastics module
+---------------------------------------------
+
+.. automodule:: GPy.inference.optimization.stochastics
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/GPy.likelihoods.rst b/doc/GPy.likelihoods.rst
index 70679454..9d74fead 100644
--- a/doc/GPy.likelihoods.rst
+++ b/doc/GPy.likelihoods.rst
@@ -60,14 +60,6 @@ GPy.likelihoods.mixed_noise module
     :undoc-members:
     :show-inheritance:
 
-GPy.likelihoods.negative_binomial module
-----------------------------------------
-
-.. automodule:: GPy.likelihoods.negative_binomial
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 GPy.likelihoods.ordinal module
 ------------------------------
 
@@ -84,30 +76,6 @@ GPy.likelihoods.poisson module
     :undoc-members:
     :show-inheritance:
 
-GPy.likelihoods.skew_exponential module
----------------------------------------
-
-.. automodule:: GPy.likelihoods.skew_exponential
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.likelihoods.skew_normal module
-----------------------------------
-
-.. automodule:: GPy.likelihoods.skew_normal
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-GPy.likelihoods.sstudent_t module
----------------------------------
-
-.. automodule:: GPy.likelihoods.sstudent_t
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 GPy.likelihoods.student_t module
 --------------------------------
 
@@ -116,14 +84,6 @@ GPy.likelihoods.student_t module
     :undoc-members:
     :show-inheritance:
 
-GPy.likelihoods.symbolic module
--------------------------------
-
-.. automodule:: GPy.likelihoods.symbolic
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 Module contents
 ---------------
diff --git a/doc/GPy.mappings.rst b/doc/GPy.mappings.rst
index e5d89872..c13642cc 100644
--- a/doc/GPy.mappings.rst
+++ b/doc/GPy.mappings.rst
@@ -36,14 +36,6 @@ GPy.mappings.mlp module
     :undoc-members:
     :show-inheritance:
 
-GPy.mappings.symbolic module
-----------------------------
-
-.. automodule:: GPy.mappings.symbolic
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 
 Module contents
 ---------------
diff --git a/doc/GPy.testing.rst b/doc/GPy.testing.rst
index 657d0638..bef24a30 100644
--- a/doc/GPy.testing.rst
+++ b/doc/GPy.testing.rst
@@ -84,10 +84,10 @@ GPy.testing.prior_tests module
     :undoc-members:
     :show-inheritance:
 
-GPy.testing.tie_tests module
-----------------------------
+GPy.testing.sparse_tests module
+-------------------------------
 
-.. automodule:: GPy.testing.tie_tests
+.. automodule:: GPy.testing.sparse_tests
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/doc/GPy.util.rst b/doc/GPy.util.rst
index 14c7643b..e50efdfb 100644
--- a/doc/GPy.util.rst
+++ b/doc/GPy.util.rst
@@ -204,14 +204,6 @@ GPy.util.subarray_and_sorting module
     :undoc-members:
     :show-inheritance:
 
-GPy.util.symbolic module
-------------------------
-
-.. automodule:: GPy.util.symbolic
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
 GPy.util.univariate_Gaussian module
 -----------------------------------