diff --git a/composer-dist.json b/composer-dist.json
index 33f5f9fd4..b77e8ab6c 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -22,7 +22,7 @@
          "psr-4": {
              "SeedDMS\\Console\\": "seeddms/utils"
          },
-         "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php"]
+         "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"]
     },
     "require": {
         "pear/http_request2": "^2",
diff --git a/composer.json b/composer.json
index d26bdd4b3..c032385d5 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
          "psr-4": {
              "Seeddms\\Console\\": "utils"
          },
-         "classmap": ["inc/inc.ClassTranslator.php", "inc/inc.ClassSettings.php", "inc/inc.Version.php"]
+         "classmap": ["inc/inc.ClassTranslator.php", "inc/inc.ClassSettings.php", "inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"]
     },
     "require": {
         "php": ">=8.2.0",
diff --git a/controllers/class.ClearCache.php b/controllers/class.ClearCache.php
index b91f51791..070c10f98 100644
--- a/controllers/class.ClearCache.php
+++ b/controllers/class.ClearCache.php
@@ -23,8 +23,6 @@
 class SeedDMS_Controller_ClearCache extends SeedDMS_Controller_Common {
 
 	public function run() {
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
 		$settings = $this->params['settings'];
 		$post = $this->params['post'];
 
diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 26817f45e..76663cfeb 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -93,7 +93,5 @@ require_once('inc/inc.Tasks.php');
 require_once("inc.ConversionInit.php");
 require_once('inc.FulltextInit.php');
 require_once('inc.AuthenticationInit.php');
-require_once("inc.ClassNotificationService.php");
-require_once("inc.ClassEmailNotify.php");
 require_once('inc.Notification.php');
 
diff --git a/inc/inc.Extension.php b/inc/inc.Extension.php
index 4df5a4a41..88c00d899 100644
--- a/inc/inc.Extension.php
+++ b/inc/inc.Extension.php
@@ -11,8 +11,6 @@
  * @version    Release: @package_version@
  */
 
-global $logger;
-
 require "inc.ClassExtensionMgr.php";
 require_once "inc.ClassSchedulerTaskBase.php";
 require_once "inc.ClassExtBase.php";
diff --git a/inc/inc.Notification.php b/inc/inc.Notification.php
index 400740d9b..d148c113c 100644
--- a/inc/inc.Notification.php
+++ b/inc/inc.Notification.php
@@ -12,6 +12,9 @@
  * @version    Release: @package_version@
  */
 
+require_once("inc.ClassEmailNotify.php");
+require_once("inc.ClassNotificationService.php");
+
 $notifier = new SeedDMS_NotificationService($logger, $settings, $translator);
 
 if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
diff --git a/www/index.php b/www/index.php
index 7cc96955d..dd061117d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -76,7 +76,7 @@ if (true) {
 			if (method_exists($hookObj, 'addRoute')) {
 				// FIXME: pass $app only just like initRestAPI. $app has a container
 				// which contains all other objects
-				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings, 'conversionmgr'=>$conversionmgr, 'authenticator'=>$authenticator, 'fulltextservice'=>$fulltextservice, 'logger'=>$logger));
+				$hookObj->addRoute(array('dms'=>$dms, 'app'=>$app, 'settings'=>$settings, 'conversionmgr'=>$conversionmgr, 'authenticator'=>$authenticator, 'fulltextservice'=>$fulltextservice, 'logger'=>$logger, 'notifier'=>$notifier, 'translator'=>$translator));
 			}
 		}
 	}