diff --git a/FieldOpt/Optimization/constraints/constraint.h b/FieldOpt/Optimization/constraints/constraint.h
index b3cbfe407..ced53c264 100644
--- a/FieldOpt/Optimization/constraints/constraint.h
+++ b/FieldOpt/Optimization/constraints/constraint.h
@@ -35,8 +35,6 @@ namespace Optimization { namespace Constraints {
 /*!
  * \brief The Constraint class is the abstract parent class to all other constraint classes. One Constraint
  * object should be created for each defined constraint.
- *
- * \todo Find a way to determine which variables a constraint should be applied to.
  */
 class Constraint
 {
diff --git a/FieldOpt/Optimization/optimizer.h b/FieldOpt/Optimization/optimizer.h
index cd7376e86..59bfaa9a2 100644
--- a/FieldOpt/Optimization/optimizer.h
+++ b/FieldOpt/Optimization/optimizer.h
@@ -38,8 +38,6 @@ namespace Optimization {
 /*!
  * \brief The Optimizer class is the abstract parent class for all optimizers. It is primarily
  * designed to support direct search optimization algorithms.
- *
- * \todo GetProgress method
  */
 class Optimizer
 {
@@ -102,16 +100,12 @@ class Optimizer
     /*!
      * \brief BetterCaseFoundLastEvaluation Searches the list of recently evaluated cases in the case handler for a case
      * with a better objective function value than the current tentative best case.
-     *
-     * \todo Implement both minimization and maximization. Currently only maximization is implemented.
      * \return True if a better case is found, otherwise false.
      */
     bool betterCaseFoundLastEvaluation();
 
     /*!
      * \brief ApplyNewTentativeBestCase Sets the tentative best case to the best case found in the case handler (if one is found).
-     *
-     * \todo Implement both minimization and maximization. Currently only maximization is implemented.
      */
     void applyNewTentativeBestCase();
 
diff --git a/FieldOpt/Optimization/optimizers/compass_search.h b/FieldOpt/Optimization/optimizers/compass_search.h
index 4eaae94ce..c3ef58bb2 100644
--- a/FieldOpt/Optimization/optimizers/compass_search.h
+++ b/FieldOpt/Optimization/optimizers/compass_search.h
@@ -36,7 +36,11 @@ namespace Optimization { namespace Optimizers {
  *
  * This algorithm only supports integer and real variables.
  *
- * \todo Insert complete reference here.
+ * Reference:
+ *
+ * Kolda, Tamara G., Robert Michael Lewis, and Virginia Torczon.
+ *  "Optimization by direct search: New perspectives on some classical and modern methods."
+ *  SIAM review 45.3 (2003): 385-482.
  */
 class CompassSearch : public Optimizer
 {
diff --git a/FieldOpt/Runner/runners/abstract_runner.h b/FieldOpt/Runner/runners/abstract_runner.h
index c59740e64..a8f0314bf 100644
--- a/FieldOpt/Runner/runners/abstract_runner.h
+++ b/FieldOpt/Runner/runners/abstract_runner.h
@@ -46,8 +46,6 @@ class MainRunner;
  *
  * It also defines the purely virtual Execute() method which should be implemented by all concrete
  * runners.
- *
- * \todo Methods for logging common to all runnes (maybe make them virtual so they can be overridden)
  */
 class AbstractRunner
 {
diff --git a/FieldOpt/Simulation/simulator_interfaces/eclsimulator.h b/FieldOpt/Simulation/simulator_interfaces/eclsimulator.h
index 990665bb5..5b2759b50 100644
--- a/FieldOpt/Simulation/simulator_interfaces/eclsimulator.h
+++ b/FieldOpt/Simulation/simulator_interfaces/eclsimulator.h
@@ -48,7 +48,6 @@ namespace SimulatorInterfaces {
  *  sim.CleanUp();
  * \endcode
  *
- * \todo Support other execution scripts (i.e. get it from settings)
  * \todo Support custom execution commands.
  */
 class ECLSimulator : public Simulator