diff --git a/Makefile b/Makefile
index 1d246447..8a71aa72 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,14 @@ help:
 
 .PHONY: help Makefile
 
+# Remove all dependencies.
+uninstall:
+	@pip freeze | grep -v "^-e" | sed "s/@.*//" | xargs pip uninstall -y
+
 # Install dependencies.
 install:
 	@pip install --upgrade pip
-	@pip install -r requirements.txt --use-deprecated=legacy-resolver
+	@pip install -r requirements.txt
 
 test:
 	@${MAKE} lint
diff --git a/source/openfisca-python-api/parameters.rst b/source/openfisca-python-api/parameters.rst
index dc7d01a3..6c7e27ed 100644
--- a/source/openfisca-python-api/parameters.rst
+++ b/source/openfisca-python-api/parameters.rst
@@ -13,6 +13,9 @@ Parameters
 .. autoclass:: ParameterAtInstant
     :members:
 
+.. autoclass:: ParameterNode
+    :members:
+
 .. autoclass:: ParameterNodeAtInstant
     :members:
 
diff --git a/source/openfisca-python-api/populations.rst b/source/openfisca-python-api/populations.rst
index c94d27a1..96c70878 100644
--- a/source/openfisca-python-api/populations.rst
+++ b/source/openfisca-python-api/populations.rst
@@ -4,8 +4,11 @@ Populations
 
 .. module:: openfisca_core.populations
 
-.. autoclass:: openfisca_core.populations.Population
-    :members: __call__, has_role, get_rank
+.. autoclass:: openfisca_core.populations.CorePopulation
+    :members: __call__
+
+.. autoclass:: openfisca_core.populations.SinglePopulation
+    :members: has_role, get_rank
 
 .. autoclass:: openfisca_core.populations.GroupPopulation
     :members: all, any, max, min, nb_persons, sum
diff --git a/source/openfisca-python-api/simulations.rst b/source/openfisca-python-api/simulations.rst
index e7d0f7ad..9dec630d 100644
--- a/source/openfisca-python-api/simulations.rst
+++ b/source/openfisca-python-api/simulations.rst
@@ -7,5 +7,8 @@ Simulations
 .. autoclass:: SimulationBuilder
     :members: build_from_dict, build_from_entities, build_from_variables, build_default_simulation, explicit_singular_entities
 
+.. autoclass:: Simulation
+    :members: calculate, get_array, get_holder, get_memory_usage
+
 .. automodule:: openfisca_core.simulations.helpers
     :members:
diff --git a/source/openfisca-python-api/tracer.rst b/source/openfisca-python-api/tracer.rst
index 6034c58f..7ccf81e8 100644
--- a/source/openfisca-python-api/tracer.rst
+++ b/source/openfisca-python-api/tracer.rst
@@ -2,19 +2,6 @@
 Tracer
 ======
 
-.. module:: openfisca_core.tracers
-
-.. autoclass:: ComputationLog
-    :members:
-
-.. autoclass:: FlatTrace
-    :members:
-
-.. autoclass:: PerformanceLog
-    :members:
-
-.. autoclass:: TraceNode
-    :members:
-
-.. autoclass:: TracingParameterNodeAtInstant
+.. automodule:: openfisca_core.tracers
     :members:
+    :imported-members: