diff --git a/application/Espo/Core/NotificatorFactory.php b/application/Espo/Core/NotificatorFactory.php
index 3a8b0da3be..2fc6b5d386 100644
--- a/application/Espo/Core/NotificatorFactory.php
+++ b/application/Espo/Core/NotificatorFactory.php
@@ -36,7 +36,7 @@ use Espo\Core\Notificators\DefaultNotificator;
 
 class NotificatorFactory
 {
-    protected $baseClassName = DefaultNotificator::class;
+    protected $defaultClassName = DefaultNotificator::class;
 
     protected $injectableFactory;
     protected $classFinder;
@@ -52,7 +52,7 @@ class NotificatorFactory
         $className = $this->classFinder->find('Notificators', $entityType);
 
         if (!$className || !class_exists($className)) {
-            $className = $this->baseClassName;
+            $className = $this->defaultClassName;
         }
 
         $obj = $this->injectableFactory->create($className);
diff --git a/application/Espo/Core/SelectManagerFactory.php b/application/Espo/Core/SelectManagerFactory.php
index 1055ca57d6..4ccd9adaf9 100644
--- a/application/Espo/Core/SelectManagerFactory.php
+++ b/application/Espo/Core/SelectManagerFactory.php
@@ -33,40 +33,28 @@ use Espo\Core\Exceptions\Error;
 
 use Espo\Core\InjectableFactory;
 use Espo\Core\SelectManagers\SelectManager;
-use Espo\Core\ORM\EntityManager;
 use Espo\Entities\User;
 use Espo\Core\Utils\Util;
 
 class SelectManagerFactory
 {
-    private $entityManager;
+    protected $defaultClassName = SelectManager::class;
+
     private $user;
     private $acl;
-    private $metadata;
     private $injectableFactory;
-    private $fieldManagerUtil;
     private $classFinder;
 
-    protected $baseClassName = SelectManager::class;
-
     public function __construct(
-        EntityManager $entityManager,
         User $user,
         Acl $acl,
         AclManager $aclManager,
-        Utils\Metadata $metadata,
-        Utils\Config $config,
-        Utils\FieldManagerUtil $fieldManagerUtil,
         InjectableFactory $injectableFactory,
         Utils\ClassFinder $classFinder
     ) {
-        $this->entityManager = $entityManager;
         $this->user = $user;
         $this->acl = $acl;
         $this->aclManager = $aclManager;
-        $this->metadata = $metadata;
-        $this->config = $config;
-        $this->fieldManagerUtil = $fieldManagerUtil;
         $this->injectableFactory = $injectableFactory;
         $this->classFinder = $classFinder;
     }
@@ -76,7 +64,7 @@ class SelectManagerFactory
         $className = $this->classFinder->find('SelectManagers', $entityType);
 
         if (!$className || !class_exists($className)) {
-            $className = $this->baseClassName;
+            $className = $this->defaultClassName;
         }
 
         if ($user) {