diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php
index 045da9445..3911f2e95 100644
--- a/libraries/chart.lib.php
+++ b/libraries/chart.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * Chart functions used to generate various types of charts.
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_chart.php b/libraries/chart/pma_chart.php
index ae483c89a..670880417 100644
--- a/libraries/chart/pma_chart.php
+++ b/libraries/chart/pma_chart.php
@@ -3,7 +3,6 @@
 /**
  * Holds the base class that all charts inherit from and some widely used
  * constants.
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php
index b8e5375e9..278676aa5 100644
--- a/libraries/chart/pma_pchart_chart.php
+++ b/libraries/chart/pma_pchart_chart.php
@@ -3,7 +3,6 @@
 /**
  * Holds the base class that all charts using pChart inherit from and some
  * widely used constants
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_multi.php b/libraries/chart/pma_pchart_multi.php
index 685b746a9..171cc50fe 100644
--- a/libraries/chart/pma_pchart_multi.php
+++ b/libraries/chart/pma_pchart_multi.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_multi_bar.php b/libraries/chart/pma_pchart_multi_bar.php
index 6c3969b44..619ef1a17 100644
--- a/libraries/chart/pma_pchart_multi_bar.php
+++ b/libraries/chart/pma_pchart_multi_bar.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_multi_line.php b/libraries/chart/pma_pchart_multi_line.php
index 892c01195..bd7b6ea0e 100644
--- a/libraries/chart/pma_pchart_multi_line.php
+++ b/libraries/chart/pma_pchart_multi_line.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php
index 2224acc9f..e4acae2f7 100644
--- a/libraries/chart/pma_pchart_multi_radar.php
+++ b/libraries/chart/pma_pchart_multi_radar.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php
index 5bf77fcf0..cc82df5c5 100644
--- a/libraries/chart/pma_pchart_pie.php
+++ b/libraries/chart/pma_pchart_pie.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_single.php b/libraries/chart/pma_pchart_single.php
index 04fef80c6..6579a9bc3 100644
--- a/libraries/chart/pma_pchart_single.php
+++ b/libraries/chart/pma_pchart_single.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_single_bar.php b/libraries/chart/pma_pchart_single_bar.php
index 821df636e..e6519700a 100644
--- a/libraries/chart/pma_pchart_single_bar.php
+++ b/libraries/chart/pma_pchart_single_bar.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_single_line.php b/libraries/chart/pma_pchart_single_line.php
index a0ac7422a..799a48b75 100644
--- a/libraries/chart/pma_pchart_single_line.php
+++ b/libraries/chart/pma_pchart_single_line.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php
index 1b31cd057..dbe2b2e18 100644
--- a/libraries/chart/pma_pchart_single_radar.php
+++ b/libraries/chart/pma_pchart_single_radar.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/chart/pma_pchart_stacked_bar.php b/libraries/chart/pma_pchart_stacked_bar.php
index 4a633f005..0ef72ec51 100644
--- a/libraries/chart/pma_pchart_stacked_bar.php
+++ b/libraries/chart/pma_pchart_stacked_bar.php
@@ -1,7 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @author Martynas Mickevicius <mmartynas@gmail.com>
  * @package phpMyAdmin
  */
 
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index 6b8affab3..aa5f43c7f 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -13,7 +13,6 @@ include_once("Export_Relation_Schema.class.php");
  * helps in developing structure of DIA Schema Export
  *
  * @name PMA_DIA
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @access public
@@ -189,7 +188,6 @@ class PMA_DIA extends XMLWriter
  * and helps in drawing/generating the Tables in dia XML document.
  *
  * @name Table_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_DIA
@@ -441,7 +439,6 @@ class Table_Stats
  * in dia XML document.
  *
  * @name Relation_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_DIA
@@ -643,7 +640,6 @@ class Relation_Stats
  * to this class
  *
  * @name Dia_Relation_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index e783cbd33..fba038615 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -13,7 +13,6 @@ include_once("Export_Relation_Schema.class.php");
  * helps in developing structure of EPS Schema Export
  *
  * @name PMA_EPS
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @access public
@@ -352,7 +351,6 @@ class PMA_EPS
  * and helps in drawing/generating the Tables in EPS.
  *
  * @name Table_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_EPS
@@ -556,7 +554,6 @@ class Table_Stats
  * in EPS document.
  *
  * @name Relation_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_EPS
@@ -722,7 +719,6 @@ class Relation_Stats
  * to this class
  * 
  * @name Eps_Relation_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
@@ -855,4 +851,4 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
         }
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index af9b4de1c..87f80ba73 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -12,7 +12,6 @@
  * it works like factory pattern
  *
  * @name Export Relation Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index 78e6387b5..f8147503f 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -21,7 +21,6 @@ require_once './libraries/tcpdf/tcpdf.php';
  * in developing the structure of PDF Schema Export
  * 
  * @name PMA_PDF
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @access public
@@ -459,7 +458,6 @@ class PMA_PDF extends TCPDF
  * and helps in drawing/generating the Tables in PDF document.
  *
  * @name Table_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_PDF
@@ -673,7 +671,6 @@ class Table_Stats
  * in PDF document.
  *
  * @name Relation_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale
@@ -819,7 +816,6 @@ class Relation_Stats
  * to this class
  *
  * @name Pdf_Relation_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
@@ -1349,4 +1345,4 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
         } //end each    
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index a0bba96a6..76fd58548 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -13,7 +13,6 @@ include_once("Export_Relation_Schema.class.php");
  * helps in developing structure of SVG Schema Export
  *
  * @name PMA_SVG
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @access public
@@ -322,7 +321,6 @@ class PMA_SVG extends XMLWriter
  * and helps in drawing/generating the Tables in SVG XML document.
  *
  * @name Table_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_SVG
@@ -533,7 +531,6 @@ class Table_Stats
  * in SVG XML document.
  *
  * @name Relation_Stats
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @see PMA_SVG::printElementLine
@@ -698,7 +695,6 @@ class Relation_Stats
  * to this class
  *
  * @name Svg_Relation_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 09eb25f3e..8636d0285 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -12,7 +12,6 @@
  * export options are shown to user from they can choose
  *
  * @name User_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index e3aaba12f..d4aaa2f21 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -13,7 +13,6 @@ include_once("Export_Relation_Schema.class.php");
  * helps in developing structure of MS Visio Schema Export
  *
  * @name PMA_VISIO
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  * @access public
@@ -474,7 +473,6 @@ class Relation_Stats
  * to this class
  * 
  * @name Visio_Relation_Schema
- * @author Muhammad Adnan <hiddenpearls@gmail.com>
  * @copyright
  * @license
  */
@@ -596,4 +594,4 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
         }
     }
 }
-?>
\ No newline at end of file
+?>