diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php
index 75968b2d9..0aed74c45 100644
--- a/gulliver/system/class.database_mysql.php
+++ b/gulliver/system/class.database_mysql.php
@@ -701,7 +701,6 @@ class database extends database_base {
 
   /**
    * It is part of class.pagedTable.php
-   * @package gulliver.system
    */
   function getLimitRenderTable($nCurrentPage, $nRowsPerPage)
   {
diff --git a/gulliver/system/class.dbconnection.php b/gulliver/system/class.dbconnection.php
index 594c56895..2051166a9 100644
--- a/gulliver/system/class.dbconnection.php
+++ b/gulliver/system/class.dbconnection.php
@@ -24,9 +24,6 @@
  * 
  */
 
-/**
- * @package gulliver.system
-*/
 require_once ("DB.php");
 
 define ( 'DB_ERROR_NO_SHOW_AND_CONTINUE', 0);
diff --git a/gulliver/system/class.error.php b/gulliver/system/class.error.php
index 17429eb08..f5553651f 100644
--- a/gulliver/system/class.error.php
+++ b/gulliver/system/class.error.php
@@ -24,9 +24,6 @@
  * 
  */
 
-/**
- * @package gulliver.system
-*/
 
 require_once 'PEAR.php';
 
@@ -82,7 +79,6 @@ class G_Error extends PEAR_Error
   /**
   * this function returns the kind of Error
   * @author
-  * @package gulliver.system
   * @access public
   * @param  string $code
   * @return string
diff --git a/gulliver/system/class.filterForm.php b/gulliver/system/class.filterForm.php
index dcbaca9e3..ba1dee001 100644
--- a/gulliver/system/class.filterForm.php
+++ b/gulliver/system/class.filterForm.php
@@ -42,7 +42,6 @@ class filterForm extends form
   * @param  string $template
   * @param  string $scriptContent
   * @return string
-  * @package gulliver.system
   */
   function render( $template, &$scriptContent )
   {
diff --git a/gulliver/system/class.htmlArea.php b/gulliver/system/class.htmlArea.php
index 547d63b08..b03d155a1 100644
--- a/gulliver/system/class.htmlArea.php
+++ b/gulliver/system/class.htmlArea.php
@@ -58,7 +58,6 @@ class XmlForm_Field_HTML extends XmlForm_Field_Textarea
   * @access public
   * @param  string $element
   * @return string
-  * @package gulliver.system
   *
   */
   function attachEvents($element) {
diff --git a/gulliver/system/class.mailer.php b/gulliver/system/class.mailer.php
index 6b48844da..85fcff041 100644
--- a/gulliver/system/class.mailer.php
+++ b/gulliver/system/class.mailer.php
@@ -264,7 +264,6 @@ class mailer
    * html2text
    *
    * empty
-   * @package gulliver.system
    * @return none
    */   
   function html2text()
diff --git a/gulliver/system/class.templatePower.php b/gulliver/system/class.templatePower.php
index 4675c15c7..8332182e2 100644
--- a/gulliver/system/class.templatePower.php
+++ b/gulliver/system/class.templatePower.php
@@ -54,9 +54,6 @@
 //
 // $Id: Version 3.0.2$
 
-/**
- * @package gulliver.system
-*/
 define("T_BYFILE",              0);
 define("T_BYVAR",               1);
 
@@ -740,7 +737,6 @@ class TemplatePower extends TemplatePowerParser
      *
      * @return void
      * @access public
-     * @package gulliver.system
      */
   function getOutputContent()
   {
diff --git a/gulliver/system/class.testTools.php b/gulliver/system/class.testTools.php
index beb14269f..f37c0b469 100644
--- a/gulliver/system/class.testTools.php
+++ b/gulliver/system/class.testTools.php
@@ -175,7 +175,6 @@ class testTools
  *
  * @param  string $location *
  * @return object $result
- * @package gulliver.system
  */   
 
 function domain($location)
diff --git a/gulliver/system/class.tree.php b/gulliver/system/class.tree.php
index 7e9b7eaaf..5c9179df8 100644
--- a/gulliver/system/class.tree.php
+++ b/gulliver/system/class.tree.php
@@ -143,7 +143,6 @@
     
     /**
      * render
-     * @package gulliver.system
      * @return $obj->printObject( array( 'node' => &$this ) )
      */   
     function render() {
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index cd412f159..18e488706 100644
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2085,7 +2085,6 @@ class XmlForm_Field_Checkbox extends XmlForm_Field
    * @param  $value
    * @param  $owner
    * @return either the value or falseValue
-   * @package gulliver.system
    */
   function maskValue($value, &$owner)
   {
@@ -2591,7 +2590,6 @@ class XmlForm_Field_CheckGroup extends XmlForm_Field
    * @param string value
    * @param string owner
    * @return string
-   * @package gulliver.system
    */
   function render($value = NULL, $owner = NULL)
   {
@@ -3171,7 +3169,7 @@ class XmlForm_Field_Date extends XmlForm_Field_SimpleText
 
 
 /**
- * @description   Calendar Widget with Javascript Routines
+ * Calendar Widget with Javascript Routines
  * @author      Erik amaru Ortiz <aortiz@gmail.com, erik@colosa.com>
  * @package gulliver.system
  */
diff --git a/gulliver/system/class.ymlDomain.php b/gulliver/system/class.ymlDomain.php
index 0dea996b6..8821654f8 100644
--- a/gulliver/system/class.ymlDomain.php
+++ b/gulliver/system/class.ymlDomain.php
@@ -23,9 +23,6 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  * 
  */
- /**
- * @package gulliver.system
- */
 
 require_once( PATH_THIRDPARTY.'lime/yaml.class.php');
 /**