diff --git a/workflow/engine/classes/PMLicensedFeatures.php b/workflow/engine/classes/PMLicensedFeatures.php
index 71d2f181a..245dc98c3 100644
--- a/workflow/engine/classes/PMLicensedFeatures.php
+++ b/workflow/engine/classes/PMLicensedFeatures.php
@@ -335,10 +335,6 @@ class PMLicensedFeatures
     /*----------------------------------********---------------------------------*/
     public function verifyfeature ($featureName)
     {
-        if (!class_exists("pmLicenseManager")) {
-            require_once ("classes" . PATH_SEP . "class.pmLicenseManager.php");
-        }
-
         $licenseManager = pmLicenseManager::getSingleton(false);
 
         $_SESSION['__sw__'] = true;
diff --git a/workflow/engine/classes/PMPluginRegistry.php b/workflow/engine/classes/PMPluginRegistry.php
index 5197975a6..85e47a4e4 100644
--- a/workflow/engine/classes/PMPluginRegistry.php
+++ b/workflow/engine/classes/PMPluginRegistry.php
@@ -1,45 +1,7 @@
 <?php
-
-/**
- * class.pluginRegistry.php
- *
- * @package workflow.engine.classes
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-
 use ProcessMaker\Plugins\PluginRegistry;
 
-/**
- *
- * @package workflow.engine.classes
- */
-
-require_once 'class.plugin.php';
-
-
-
-/**
- *
- * @package workflow.engine.classes
- */class PMPluginRegistry
+class PMPluginRegistry
 {
     private $_aPluginDetails = array ();
     private $_aPlugins = array ();
@@ -1137,9 +1099,6 @@ require_once 'class.plugin.php';
     public function setupPlugins ()
     {
         try {
-            require_once(PATH_CORE . "methods" . PATH_SEP . "enterprise" . PATH_SEP . "enterprise.php");
-            require_once("class.serverConfiguration.php");
-
             $iPlugins = 0;
             $oServerConf = & serverConf::getSingleton();
             $oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails );
diff --git a/workflow/engine/classes/PMmemcached.php b/workflow/engine/classes/PMmemcached.php
index 9b34ed7d8..74098d33c 100644
--- a/workflow/engine/classes/PMmemcached.php
+++ b/workflow/engine/classes/PMmemcached.php
@@ -1,37 +1,6 @@
 <?php
-/**
- * class.memcached.php
- *
- * @package workflow.engine.ProcessMaker
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2011 Colosa Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
 
-/**
- * The ProcessMaker memcached 
-/**
- * The ProcessMaker memcached class
- *
- * @package workflow.engine.ProcessMaker
- */class PMmemcached
+class PMmemcached
 {
     const ONE_MINUTE = 60;
     const ONE_HOUR = 3600;
diff --git a/workflow/engine/classes/Padl.php b/workflow/engine/classes/Padl.php
index dfa760ebd..9f18840d0 100644
--- a/workflow/engine/classes/Padl.php
+++ b/workflow/engine/classes/Padl.php
@@ -53,7 +53,8 @@
  * @version 0.1
  * @history---------------------------------------------
  * see CHANGELOG
- */class padl
+ */
+class Padl
 {
     /**
      * hash key 1 used to encrypt the generate key data.
diff --git a/workflow/engine/classes/Patch.php b/workflow/engine/classes/Patch.php
index 597a1cf02..1ebd9ddb7 100644
--- a/workflow/engine/classes/Patch.php
+++ b/workflow/engine/classes/Patch.php
@@ -5,12 +5,7 @@
  * @author reav
  *
  */
-
-/**
- * class, helping to set some not desirable settings but necesary
- * @author reav
- *
- */abstract class patch
+abstract class Patch
 {
     static protected $isPathchable = false;
     static public $dbAdapter = 'mysql';