diff --git a/workflow/engine/classes/EnterpriseUtils.php b/workflow/engine/classes/EnterpriseUtils.php
index 2cccf23f4..3cafc36dd 100644
--- a/workflow/engine/classes/EnterpriseUtils.php
+++ b/workflow/engine/classes/EnterpriseUtils.php
@@ -1,6 +1,4 @@
 <?php
-require_once ("classes/model/Configuration.php");
-
 
 class EnterpriseUtils
 {
diff --git a/workflow/engine/classes/License_Application.php b/workflow/engine/classes/License_Application.php
index c097dc734..fa1dc3fec 100644
--- a/workflow/engine/classes/License_Application.php
+++ b/workflow/engine/classes/License_Application.php
@@ -1,6 +1,6 @@
 <?php
 
-class license_application extends padl
+class license_application extends Padl
 {
     /**
      * The number of allowed differences between the $_SERVER vars and the vars
diff --git a/workflow/engine/classes/PMLicensedFeatures.php b/workflow/engine/classes/PMLicensedFeatures.php
index 1ff84d78a..25d394a37 100644
--- a/workflow/engine/classes/PMLicensedFeatures.php
+++ b/workflow/engine/classes/PMLicensedFeatures.php
@@ -337,7 +337,7 @@ class PMLicensedFeatures
         $licenseManager = pmLicenseManager::getSingleton(false);
 
         $_SESSION['__sw__'] = true;
-        $padl = new padl();
+        $padl = new Padl();
         $value = $padl->_decrypt($featureName);
 
         if (is_array($value)) {
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 1c482f765..0ab5dba2d 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -33,8 +33,6 @@ class AddonsStore extends BaseAddonsStore
      */
     public static function checkLicenseStore()
     {
-        require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
-
         //getting the licenseManager....
         $licenseManager = &pmLicenseManager::getSingleton();
 
@@ -331,12 +329,6 @@ class AddonsStore extends BaseAddonsStore
      */
     public function update($force = false, $type = 'plugin')
     {
-        require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
-
-        if (!class_exists('AddonsManagerPeer')) {
-            require_once ('classes/model/AddonsManager.php');
-        }
-
         //If we have any addon that is installing or updating, don't update store
         $criteria = new Criteria(AddonsManagerPeer::DATABASE_NAME);
         $criteria->add(AddonsManagerPeer::ADDON_STATE, '', Criteria::NOT_EQUAL);
diff --git a/workflow/engine/methods/enterprise/addonsStore.php b/workflow/engine/methods/enterprise/addonsStore.php
index c38805234..9d2f75024 100644
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -1,8 +1,4 @@
 <?php
-require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
-require_once PATH_CORE . "classes" . PATH_SEP . "model" . PATH_SEP . "AddonsStore.php";
-require_once PATH_CORE . "classes" . PATH_SEP . "class.enterpriseUtils.php";
-
 
 AddonsStore::checkLicenseStore();
 
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index a42344f79..4ed707c40 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -1,9 +1,4 @@
 <?php
-require_once PATH_CORE . 'classes' . PATH_SEP . 'class.enterpriseUtils.php';
-require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
-require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
-require_once PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . 'AddonsManagerPeer.php';
-
 use ProcessMaker\Plugins\PluginRegistry;
 
 function runBgProcessmaker($task, $log)
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index d5fb82be9..d7ecf83fb 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -1,7 +1,4 @@
 <?php
-require_once PATH_CORE . 'classes' . PATH_SEP . 'class.pmLicenseManager.php';
-require_once PATH_CORE . 'classes' . PATH_SEP . 'class.enterpriseUtils.php';
-
 ini_set("max_execution_time", 0);
 
 if (!defined("PM_VERSION")) {