diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php
index 2c19715d42..a6836ba004 100644
--- a/app/Http/Controllers/ExportController.php
+++ b/app/Http/Controllers/ExportController.php
@@ -23,12 +23,10 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers;
 
 use Carbon\Carbon;
-use ExpandedForm;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Export\ProcessorInterface;
 use FireflyIII\Http\Middleware\IsDemoUser;
 use FireflyIII\Http\Requests\ExportFormRequest;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
@@ -107,12 +105,11 @@ class ExportController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface   $repository
      * @param ExportJobRepositoryInterface $jobs
      *
      * @return View
      */
-    public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs)
+    public function index(ExportJobRepositoryInterface $jobs)
     {
         // create new export job.
         $job = $jobs->create();
@@ -120,15 +117,12 @@ class ExportController extends Controller
         $jobs->cleanup();
 
         // does the user have shared accounts?
-        $accounts      = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
-        $accountList   = ExpandedForm::makeSelectList($accounts);
-        $checked       = array_keys($accountList);
         $formats       = array_keys(config('firefly.export_formats'));
         $defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data;
         $first         = session('first')->format('Y-m-d');
         $today         = Carbon::create()->format('Y-m-d');
 
-        return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today'));
+        return view('export.index', compact('job', 'formats', 'defaultFormat', 'first', 'today'));
     }
 
     /**
diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php
index c33c759eb3..9c95b9509a 100644
--- a/app/Http/Controllers/RuleController.php
+++ b/app/Http/Controllers/RuleController.php
@@ -102,7 +102,6 @@ class RuleController extends Controller
         $preFilled    = [
             'strict' => true,
         ];
-        $groups       = ExpandedForm::makeSelectList($this->ruleGroupRepos->get());
         $oldTriggers  = [];
         $oldActions   = [];
         $returnToBill = false;
@@ -150,7 +149,7 @@ class RuleController extends Controller
         return view(
             'rules.rule.create',
             compact(
-                'subTitleIcon', 'oldTriggers', 'returnToBill', 'groups', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup',
+                'subTitleIcon', 'oldTriggers', 'returnToBill', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup',
                 'subTitle'
             )
         );
@@ -212,7 +211,6 @@ class RuleController extends Controller
      */
     public function edit(Request $request, Rule $rule)
     {
-        $ruleGroups   = ExpandedForm::makeSelectList($this->ruleGroupRepos->get());
         $triggerCount = 0;
         $actionCount  = 0;
         $oldActions   = [];
@@ -243,7 +241,7 @@ class RuleController extends Controller
         }
         session()->forget('rules.edit.fromUpdate');
 
-        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'));
+        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
     }
 
     /**
@@ -333,14 +331,11 @@ class RuleController extends Controller
     public function selectTransactions(Rule $rule)
     {
         // does the user have shared accounts?
-        $accounts        = $this->accountRepos->getAccountsByType([AccountType::ASSET]);
-        $accountList     = ExpandedForm::makeSelectList($accounts);
-        $checkedAccounts = array_keys($accountList);
         $first           = session('first')->format('Y-m-d');
         $today           = Carbon::create()->format('Y-m-d');
         $subTitle        = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
 
-        return view('rules.rule.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'rule', 'subTitle'));
+        return view('rules.rule.select-transactions', compact( 'first', 'today', 'rule', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php
index 16c44dea94..8aa82f72f7 100644
--- a/app/Http/Controllers/RuleGroupController.php
+++ b/app/Http/Controllers/RuleGroupController.php
@@ -179,22 +179,17 @@ class RuleGroupController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface $repository
      * @param RuleGroup                  $ruleGroup
      *
      * @return View
      */
-    public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup)
+    public function selectTransactions(RuleGroup $ruleGroup)
     {
-        // does the user have shared accounts?
-        $accounts        = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
-        $accountList     = ExpandedForm::makeSelectList($accounts);
-        $checkedAccounts = array_keys($accountList);
         $first           = session('first')->format('Y-m-d');
         $today           = Carbon::create()->format('Y-m-d');
         $subTitle        = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
 
-        return view('rules.rule-group.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'ruleGroup', 'subTitle'));
+        return view('rules.rule-group.select-transactions', compact( 'first', 'today', 'ruleGroup', 'subTitle'));
     }
 
     /**