diff --git a/routes.php b/routes.php
index 0bc05c23..96d90f3d 100644
--- a/routes.php
+++ b/routes.php
@@ -5,12 +5,6 @@ use \Grocy\Middleware\SessionAuthMiddleware;
 use \Grocy\Middleware\ApiKeyAuthMiddleware;
 use \Tuupola\Middleware\CorsMiddleware;
 
-$main_route_time_start = microtime(true);
-
-$session_cookie_name = $appContainer->LoginControllerInstance->GetSessionCookieName();
-
-$session_auth_middelware = new SessionAuthMiddleware($appContainer, $session_cookie_name);
-
 $app->group('', function()
 {
 
@@ -127,9 +121,7 @@ $app->group('', function()
 	$this->get('/api', '\Grocy\Controllers\OpenApiController:DocumentationUi');
 	$this->get('/manageapikeys', '\Grocy\Controllers\OpenApiController:ApiKeysList');
 	$this->get('/manageapikeys/new', '\Grocy\Controllers\OpenApiController:CreateNewApiKey');
-
-})->add($session_auth_middelware);
-
+})->add(new SessionAuthMiddleware($appContainer, $appContainer->LoginControllerInstance->GetSessionCookieName()));
 
 $app->group('/api', function()
 {
diff --git a/services/ApplicationService.php b/services/ApplicationService.php
index f17c31b4..13137dd0 100644
--- a/services/ApplicationService.php
+++ b/services/ApplicationService.php
@@ -6,11 +6,6 @@ class ApplicationService extends BaseService
 {
 	private $InstalledVersion;
 
-    #private function __construct()
-	#{
-	#	parent::__construct();
-	#}
-
 	public function GetInstalledVersion()
 	{
 		if ($this->InstalledVersion == null)
diff --git a/services/DemoDataGeneratorService.php b/services/DemoDataGeneratorService.php
index 7e025cd6..0942e408 100644
--- a/services/DemoDataGeneratorService.php
+++ b/services/DemoDataGeneratorService.php
@@ -9,9 +9,11 @@ class DemoDataGeneratorService extends BaseService
 	public function __construct()
 	{
 		parent::__construct();
-		$this->getLocalizationService() = new LocalizationService(GROCY_CULTURE);
+		$this->LocalizationService = new LocalizationService(GROCY_CULTURE);
 	}
 
+    protected $LocalizationService;
+
 	public function PopulateDemoData()
 	{
 		$rowCount = $this->getDatabaseService()->ExecuteDbQuery('SELECT COUNT(*) FROM migrations WHERE migration = -1')->fetchColumn();