diff --git a/lib/AccessCheck/App/Step1.pm b/lib/AccessCheck/App/Step1.pm
index 1ce567e5d8457226a2e0ede1e79c350a109b9cbf..4750fa380699b1ad7e9b508872dca9b5a8bf33bb 100644
--- a/lib/AccessCheck/App/Step1.pm
+++ b/lib/AccessCheck/App/Step1.pm
@@ -14,17 +14,14 @@ sub run {
     my $config = $app->config();
     my $log    = $app->log();
 
-    $self->init_l10n();
-    $self->init_user();
-    $self->init_db();
+    my $l10n = $self->init_l10n();
+    my $user = $self->init_user();
+    my $db   = $self->init_db();
 
     if ($config->{app}->{login_url}) {
         return if !$self->check_authentication();
     }
 
-    my $user = $self->stash('user');
-    my $db   = $self->stash('db');
-
     my $sps = AccessCheck::Data::Entity->get_entities(
         db    => $db,
         query => [
diff --git a/lib/AccessCheck/App/Step2.pm b/lib/AccessCheck/App/Step2.pm
index ccaff3717337fa5749adde227faa3a8920a3215b..4a81b52962d29351340de2b58c22d64aeee2f292 100644
--- a/lib/AccessCheck/App/Step2.pm
+++ b/lib/AccessCheck/App/Step2.pm
@@ -12,9 +12,9 @@ sub run {
     my $config = $app->config();
     my $log    = $app->log();
 
-    $self->init_l10n();
-    $self->init_user();
-    $self->init_db();
+    my $l10n = $self->init_l10n();
+    my $user = $self->init_user();
+    my $db   = $self->init_db();
 
     if ($config->{app}->{login_url}) {
         return if !$self->check_authentication();
diff --git a/lib/AccessCheck/App/Step3.pm b/lib/AccessCheck/App/Step3.pm
index cf6a6b910844a43aa6ef222a573717d02654a74b..83e68d56399b0817d59c778f724d91ffb1d7ea0e 100644
--- a/lib/AccessCheck/App/Step3.pm
+++ b/lib/AccessCheck/App/Step3.pm
@@ -20,9 +20,9 @@ sub run {
     my $config = $app->config();
     my $log    = $app->log();
 
-    $self->init_l10n();
-    $self->init_user();
-    $self->init_db();
+    my $l10n = $self->init_l10n();
+    my $user = $self->init_user();
+    my $db   = $self->init_db();
 
     if ($config->{app}->{login_url}) {
         return if !$self->check_authentication();
@@ -30,9 +30,6 @@ sub run {
 
     my $entityid = $self->param('entityid');
     my $email    = $self->param('email');
-    my $l10n     = $self->stash('l10n');
-    my $user     = $self->stash('user');
-    my $db       = $self->stash('db');
 
     my $sp = $self->get_sp(entityid => $entityid);
     return if !$sp;
diff --git a/lib/AccessCheck/App/Step4.pm b/lib/AccessCheck/App/Step4.pm
index 35c825f2d83af8c6b275f2c4e97a55ca7b8ba2be..ce72f758a6e8295d1a10adcfeca1d7ec6d806c98 100644
--- a/lib/AccessCheck/App/Step4.pm
+++ b/lib/AccessCheck/App/Step4.pm
@@ -20,9 +20,9 @@ sub run {
     my $config = $app->config();
     my $log    = $app->log();
 
-    $self->init_l10n();
-    $self->init_user();
-    $self->init_db();
+    my $l10n = $self->init_l10n();
+    my $user = $self->init_user();
+    my $db   = $self->init_db();
 
     if ($config->{app}->{login_url}) {
         return if !$self->check_authentication();
@@ -33,8 +33,6 @@ sub run {
     my $token    = $self->param('token');
     my $validity = $self->param('validity');
     my $profiles = $self->every_param('profiles');
-    my $l10n     = $self->stash('l10n');
-    my $db       = $self->stash('db');
 
     my $sp = $self->get_sp(entityid => $entityid);
     return if !$sp;
diff --git a/lib/AccessCheck/App/Step5.pm b/lib/AccessCheck/App/Step5.pm
index 5ececfd0862e8e22e8a76e2041689f35e0769374..543cc411c61492d5fab42f10c40e1bfa80b1d98e 100644
--- a/lib/AccessCheck/App/Step5.pm
+++ b/lib/AccessCheck/App/Step5.pm
@@ -19,9 +19,9 @@ sub run {
     my $config = $app->config();
     my $log    = $app->log();
 
-    $self->init_l10n();
-    $self->init_user();
-    $self->init_db();
+    my $l10n = $self->init_l10n();
+    my $user = $self->init_user();
+    my $db   = $self->init_db();
 
     if ($config->{app}->{login_url}) {
         return if !$self->check_authentication();
@@ -30,7 +30,6 @@ sub run {
     my $entityid = $self->param('entityid');
     my $token    = $self->param('token');
     my $key      = $self->param('key');
-    my $db       = $self->stash('db');
 
     return if !$self->check_token(token => $token, entityid => $entityid);