diff --git a/apps/calculation/additional_outputs/complex_list_controller.h b/apps/calculation/additional_outputs/complex_list_controller.h
index 1c7d2a654..addb7c342 100644
--- a/apps/calculation/additional_outputs/complex_list_controller.h
+++ b/apps/calculation/additional_outputs/complex_list_controller.h
@@ -10,7 +10,7 @@ namespace Calculation {
 class ComplexListController : public IllustratedListController {
 public:
   ComplexListController(EditExpressionController * editExpressionController) :
-    IllustratedListController(nullptr, editExpressionController),
+    IllustratedListController(editExpressionController),
     m_complexGraphCell(&m_model) {}
 
   // ViewController
diff --git a/apps/calculation/additional_outputs/expressions_list_controller.cpp b/apps/calculation/additional_outputs/expressions_list_controller.cpp
index 555de4433..956933b0b 100644
--- a/apps/calculation/additional_outputs/expressions_list_controller.cpp
+++ b/apps/calculation/additional_outputs/expressions_list_controller.cpp
@@ -7,8 +7,8 @@ namespace Calculation {
 
 /* Expressions list controller */
 
-ExpressionsListController::ExpressionsListController(Responder * parentResponder, EditExpressionController * editExpressionController) :
-  ListController(parentResponder, editExpressionController),
+ExpressionsListController::ExpressionsListController(EditExpressionController * editExpressionController) :
+  ListController(editExpressionController),
   m_cells{}
 {
   for (int i = 0; i < k_maxNumberOfCells; i++) {
diff --git a/apps/calculation/additional_outputs/expressions_list_controller.h b/apps/calculation/additional_outputs/expressions_list_controller.h
index df8f8e4ff..4d6ade149 100644
--- a/apps/calculation/additional_outputs/expressions_list_controller.h
+++ b/apps/calculation/additional_outputs/expressions_list_controller.h
@@ -10,7 +10,7 @@ namespace Calculation {
 
 class ExpressionsListController : public ListController {
 public:
-  ExpressionsListController(Responder * parentResponder, EditExpressionController * editExpressionController);
+  ExpressionsListController(EditExpressionController * editExpressionController);
 
   // Responder
   void viewDidDisappear() override;
diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.cpp b/apps/calculation/additional_outputs/illustrated_list_controller.cpp
index 3fd481ee6..b4d895621 100644
--- a/apps/calculation/additional_outputs/illustrated_list_controller.cpp
+++ b/apps/calculation/additional_outputs/illustrated_list_controller.cpp
@@ -8,8 +8,8 @@ namespace Calculation {
 
 /* Illustrated list controller */
 
-IllustratedListController::IllustratedListController(Responder * parentResponder, EditExpressionController * editExpressionController) :
-  ListController(parentResponder, editExpressionController, this),
+IllustratedListController::IllustratedListController(EditExpressionController * editExpressionController) :
+  ListController(editExpressionController, this),
   m_additionalCalculationCells{}
 {
   for (int i = 0; i < k_maxNumberOfAdditionalCalculations; i++) {
diff --git a/apps/calculation/additional_outputs/illustrated_list_controller.h b/apps/calculation/additional_outputs/illustrated_list_controller.h
index fdac26ddd..d06ca7edc 100644
--- a/apps/calculation/additional_outputs/illustrated_list_controller.h
+++ b/apps/calculation/additional_outputs/illustrated_list_controller.h
@@ -11,7 +11,7 @@ namespace Calculation {
 
 class IllustratedListController : public ListController, public SelectableTableViewDelegate {
 public:
-  IllustratedListController(Responder * parentResponder, EditExpressionController * editExpressionController);
+  IllustratedListController(EditExpressionController * editExpressionController);
 
   // Responder
   void viewDidDisappear() override;
diff --git a/apps/calculation/additional_outputs/integer_list_controller.h b/apps/calculation/additional_outputs/integer_list_controller.h
index a0208762d..b76f46d4d 100644
--- a/apps/calculation/additional_outputs/integer_list_controller.h
+++ b/apps/calculation/additional_outputs/integer_list_controller.h
@@ -8,7 +8,7 @@ namespace Calculation {
 class IntegerListController : public ExpressionsListController {
 public:
   IntegerListController(EditExpressionController * editExpressionController) :
-    ExpressionsListController(nullptr, editExpressionController) {}
+    ExpressionsListController(editExpressionController) {}
 
   //ListViewDataSource
   int numberOfRows() const override;
diff --git a/apps/calculation/additional_outputs/list_controller.cpp b/apps/calculation/additional_outputs/list_controller.cpp
index 3ea43cf6e..a7ebab267 100644
--- a/apps/calculation/additional_outputs/list_controller.cpp
+++ b/apps/calculation/additional_outputs/list_controller.cpp
@@ -21,8 +21,8 @@ void ListController::InnerListController::didBecomeFirstResponder() {
 
 /* List Controller */
 
-ListController::ListController(Responder * parentResponder, EditExpressionController * editExpressionController, SelectableTableViewDelegate * delegate) :
-  StackViewController(parentResponder, &m_listController, KDColorWhite, Palette::PurpleBright, Palette::PurpleDark),
+ListController::ListController(EditExpressionController * editExpressionController, SelectableTableViewDelegate * delegate) :
+  StackViewController(nullptr, &m_listController, KDColorWhite, Palette::PurpleBright, Palette::PurpleDark),
   m_listController(this, delegate),
   m_editExpressionController(editExpressionController)
 {
diff --git a/apps/calculation/additional_outputs/list_controller.h b/apps/calculation/additional_outputs/list_controller.h
index 86f24b227..0378c90b6 100644
--- a/apps/calculation/additional_outputs/list_controller.h
+++ b/apps/calculation/additional_outputs/list_controller.h
@@ -10,7 +10,7 @@ class EditExpressionController;
 
 class ListController : public StackViewController, public ListViewDataSource, public SelectableTableViewDataSource {
 public:
-  ListController(Responder * parentResponder, EditExpressionController * editExpressionController, SelectableTableViewDelegate * delegate = nullptr);
+  ListController(EditExpressionController * editExpressionController, SelectableTableViewDelegate * delegate = nullptr);
 
   // Responder
   bool handleEvent(Ion::Events::Event event) override;
diff --git a/apps/calculation/additional_outputs/rational_list_controller.h b/apps/calculation/additional_outputs/rational_list_controller.h
index fac0f06eb..62d0de5a9 100644
--- a/apps/calculation/additional_outputs/rational_list_controller.h
+++ b/apps/calculation/additional_outputs/rational_list_controller.h
@@ -8,7 +8,7 @@ namespace Calculation {
 class RationalListController : public ExpressionsListController {
 public:
   RationalListController(EditExpressionController * editExpressionController) :
-    ExpressionsListController(nullptr, editExpressionController) {}
+    ExpressionsListController(editExpressionController) {}
 
   //ListViewDataSource
   int numberOfRows() const override;
diff --git a/apps/calculation/additional_outputs/trigonometry_list_controller.h b/apps/calculation/additional_outputs/trigonometry_list_controller.h
index dfec810d9..12880e1a0 100644
--- a/apps/calculation/additional_outputs/trigonometry_list_controller.h
+++ b/apps/calculation/additional_outputs/trigonometry_list_controller.h
@@ -10,7 +10,7 @@ namespace Calculation {
 class TrigonometryListController : public IllustratedListController {
 public:
   TrigonometryListController(EditExpressionController * editExpressionController) :
-    IllustratedListController(nullptr, editExpressionController),
+    IllustratedListController(editExpressionController),
     m_graphCell(&m_model) {}
   void setExpression(Poincare::Expression e) override;
 private: