diff --git a/workflow/engine/classes/DashletRssReader.php b/workflow/engine/classes/DashletRssReader.php
index 5006b170e..d00e4d543 100644
--- a/workflow/engine/classes/DashletRssReader.php
+++ b/workflow/engine/classes/DashletRssReader.php
@@ -1,9 +1,6 @@
 <?php
 
-require_once 'classes/interfaces/DashletInterface.php';
-
-
-class dashletRssReader implements DashletInterface
+class DashletRssReader implements DashletInterface
 {
 
     const version = '1.0';
diff --git a/workflow/engine/classes/Dates.php b/workflow/engine/classes/Dates.php
index 18a7d658f..eb6808954 100644
--- a/workflow/engine/classes/Dates.php
+++ b/workflow/engine/classes/Dates.php
@@ -1,37 +1,6 @@
 <?php
 
-/**
- * class.dates.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.
- * /
- *
- * /*
- * Created on 21/01/2008
- * This 
-/**
- *
- * @package workflow.engine.classes
- */class dates
+class Dates
 {
 
     private $holidays = array();
diff --git a/workflow/engine/classes/DbConnections.php b/workflow/engine/classes/DbConnections.php
index 28ac7788b..76332fe50 100644
--- a/workflow/engine/classes/DbConnections.php
+++ b/workflow/engine/classes/DbConnections.php
@@ -1,15 +1,6 @@
 <?php
-/**
- * Author: Erik Amaru Ortiz <erik@colosa.com>
- * Description:This is a 
-/**
- * dbConnections
- *
- *
- * @copyright 2008 Colosa
- * @package workflow.engine.classes
- *
- */class DbConnections
+
+class DbConnections
 {
     private $PRO_UID;
     public $connections;
diff --git a/workflow/engine/classes/Derivation.php b/workflow/engine/classes/Derivation.php
index 8ebabe561..8e5326f42 100644
--- a/workflow/engine/classes/Derivation.php
+++ b/workflow/engine/classes/Derivation.php
@@ -1,13 +1,6 @@
 <?php
 
-/**
- * derivation - derivation 
-/**
- * derivation - derivation class
- *
- * @package workflow.engine.ProcessMaker
- *
- */class Derivation
+class Derivation
 {
     var $case;
     protected $flagControl;
@@ -1701,7 +1694,6 @@
 
     function getGrpUser ($aData)
     {
-        require_once 'classes/model/Content.php';
         $oTasks = new Tasks();
         $oGroups = new Groups();
         $oContent = new Content();
diff --git a/workflow/engine/classes/DynaformEditor.php b/workflow/engine/classes/DynaformEditor.php
index 6600a6f52..1591e5863 100644
--- a/workflow/engine/classes/DynaformEditor.php
+++ b/workflow/engine/classes/DynaformEditor.php
@@ -1,36 +1,6 @@
 <?php
 
-/**
- * class.dynaformEditor.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.
- */
-/**
- * Created on 21/12/2007
- * Dynaform - Dynaform 
-/**
- *
- * @package workflow.engine.classes
- */class dynaformEditor extends WebResource
+class DynaformEditor extends WebResource
 {
 
     private $isOldCopy = false;
diff --git a/workflow/engine/classes/PMLicensedFeatures.php b/workflow/engine/classes/PMLicensedFeatures.php
index 71d2f181a..edec26a53 100644
--- a/workflow/engine/classes/PMLicensedFeatures.php
+++ b/workflow/engine/classes/PMLicensedFeatures.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class PMLicensedFeatures
 {
     private $featuresDetails = array ();
@@ -335,10 +334,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';
diff --git a/workflow/engine/classes/WsCreateUserResponse.php b/workflow/engine/classes/WsCreateUserResponse.php
index e4a2b4058..6ac4061ad 100644
--- a/workflow/engine/classes/WsCreateUserResponse.php
+++ b/workflow/engine/classes/WsCreateUserResponse.php
@@ -1,41 +1,6 @@
 <?php
 
-/**
- * class.wsResponse.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.
- */
-
-/**
- *
- * @package workflow.engine.classes
- */
-
-
-/**
- * Class wsCreateUserResponse
- *
- * @package workflow.engine.classes
- */class wsCreateUserResponse
+class WsCreateUserResponse
 {
     public $status_code = 0;
     public $message = '';
diff --git a/workflow/engine/classes/WsGetCaseNotesResponse.php b/workflow/engine/classes/WsGetCaseNotesResponse.php
index cbf612504..eb8fa7f6e 100644
--- a/workflow/engine/classes/WsGetCaseNotesResponse.php
+++ b/workflow/engine/classes/WsGetCaseNotesResponse.php
@@ -1,41 +1,6 @@
 <?php
 
-/**
- * class.wsResponse.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.
- */
-
-/**
- *
- * @package workflow.engine.classes
- */
-
-
-/**
- * Class wsGetCaseNotesResponse
- *
- * @package workflow.engine.classes
- */class wsGetCaseNotesResponse
+class WsGetCaseNotesResponse
 {
     public $status_code = 0;
     public $message = '';
diff --git a/workflow/engine/classes/WsGetVariableResponse.php b/workflow/engine/classes/WsGetVariableResponse.php
index 0c08c76b6..8f2501dd1 100644
--- a/workflow/engine/classes/WsGetVariableResponse.php
+++ b/workflow/engine/classes/WsGetVariableResponse.php
@@ -1,41 +1,6 @@
 <?php
 
-/**
- * class.wsResponse.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.
- */
-
-/**
- *
- * @package workflow.engine.classes
- */
-
-
-/**
- * Class wsGetVariableResponse
- *
- * @package workflow.engine.classes
- */class wsGetVariableResponse
+class WsGetVariableResponse
 {
     public $status_code = 0;
     public $message = '';
diff --git a/workflow/engine/classes/WsResponse.php b/workflow/engine/classes/WsResponse.php
index d113695b3..ea6cc4e92 100644
--- a/workflow/engine/classes/WsResponse.php
+++ b/workflow/engine/classes/WsResponse.php
@@ -1,40 +1,6 @@
 <?php
 
-/**
- * class.wsResponse.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.
- */
-
-/**
- *
- * @package workflow.engine.classes
- */
-
-
-/**
- *
- * @package workflow.engine.classes
- */class wsResponse
+class WsResponse
 {
     public $status_code = 0;
     public $message = '';
diff --git a/workflow/engine/classes/XMLConnection.php b/workflow/engine/classes/XMLConnection.php
index 0a1f36ff7..3bb13096f 100644
--- a/workflow/engine/classes/XMLConnection.php
+++ b/workflow/engine/classes/XMLConnection.php
@@ -1,50 +1,6 @@
 <?php
 
-/**
- * class.xmlDb.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.
- *
- */
-
-/**
- * XMLDB
- *
- * ProcessMaker Open Source Edition
- *
- * @copyright (C) 2004 - 2008 Colosa Inc.23
- * @package workflow.engine.ProcessMaker
- *
- */
-
-/**
- * XMLConnection
- *
- * ProcessMaker Open Source Edition
- *
- * @copyright (C) 2004 - 2008 Colosa Inc.23
- * @package workflow.engine.ProcessMaker
- *
- */class XMLConnection
+class XMLConnection
 {
     var $phptype = 'myxml';
     var $caseFolding = true;
diff --git a/workflow/engine/classes/triggers/PmTrSharepointClass.php b/workflow/engine/classes/triggers/PmTrSharepointClass.php
index c89137764..5ec7fdaf3 100644
--- a/workflow/engine/classes/triggers/PmTrSharepointClass.php
+++ b/workflow/engine/classes/triggers/PmTrSharepointClass.php
@@ -1,12 +1,6 @@
 <?php
 
-/**
- * class.pmTrSharepoint.php
- */
-
-
-
-class pmTrSharepointClass
+class PmTrSharepointClass
 {
 
     public function __construct($server, $auth)
diff --git a/workflow/engine/classes/triggers/Wscaller.php b/workflow/engine/classes/triggers/WsCaller.php
similarity index 95%
rename from workflow/engine/classes/triggers/Wscaller.php
rename to workflow/engine/classes/triggers/WsCaller.php
index 467f818b6..6e1b852df 100644
--- a/workflow/engine/classes/triggers/Wscaller.php
+++ b/workflow/engine/classes/triggers/WsCaller.php
@@ -1,14 +1,6 @@
 <?php
 
-/**
- * class.pmTrSharepoint.php
- */
-
-
-
-/**
- * class.pmTrSharepoint.php
- */class wscaller
+class WsCaller
 {
 
     private $wsdlurl;
diff --git a/workflow/engine/classes/triggers/api/Zimbra.php b/workflow/engine/classes/triggers/api/Zimbra.php
index 812bb6a02..c74cf047f 100644
--- a/workflow/engine/classes/triggers/api/Zimbra.php
+++ b/workflow/engine/classes/triggers/api/Zimbra.php
@@ -20,7 +20,8 @@
  * @module zimbra.class.php
  * @author Zachary Tirrell <zbtirrell@plymouth.edu>
  * @GPL 2007, Plymouth State University, ITS
- */class Zimbra
+ */
+class Zimbra
 {
 
     public $debug = false;