diff --git a/Config.php b/Config.php
index c496673..4d094bf 100644
--- a/Config.php
+++ b/Config.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Model
  * @since 2010-02-17
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Config extends Registry
diff --git a/Load.php b/Load.php
index 51b160a..a765c2b 100644
--- a/Load.php
+++ b/Load.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Load
  * @since 2010-02-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Load
diff --git a/Registry.php b/Registry.php
index 6c4b853..69727c3 100644
--- a/Registry.php
+++ b/Registry.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Model
  * @since 2010-02-17
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Registry extends ArrayObject
diff --git a/app/Action.php b/app/Action.php
index eeebd3a..1ad7056 100644
--- a/app/Action.php
+++ b/app/Action.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage app
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Action
diff --git a/app/PagerAction.php b/app/PagerAction.php
index cd150d9..a277882 100644
--- a/app/PagerAction.php
+++ b/app/PagerAction.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage app
  * @since 2010-03-07
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class PagerAction extends Action
diff --git a/app/StaticAction.php b/app/StaticAction.php
index eff6f75..b1bfa96 100644
--- a/app/StaticAction.php
+++ b/app/StaticAction.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage app
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class StaticAction extends Action
diff --git a/app/router/Route.php b/app/router/Route.php
index 4f2a623..92a59c8 100644
--- a/app/router/Route.php
+++ b/app/router/Route.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage app
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Route
diff --git a/cache/Cache.php b/cache/Cache.php
index f68d10b..bc97f36 100644
--- a/cache/Cache.php
+++ b/cache/Cache.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Cache
  * @since 2010-03-04
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Cache
diff --git a/cache/CacheKey.php b/cache/CacheKey.php
index d7a4aeb..61678f0 100644
--- a/cache/CacheKey.php
+++ b/cache/CacheKey.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Cache
  * @since 2010-03-10
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class CacheKey
diff --git a/cache/Cacher.php b/cache/Cacher.php
index 0d35887..889d6b1 100644
--- a/cache/Cacher.php
+++ b/cache/Cacher.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Cache
  * @since 2010-03-04
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Cacher
diff --git a/cache/MemcacheCache.php b/cache/MemcacheCache.php
index aa6b5cc..91430e3 100644
--- a/cache/MemcacheCache.php
+++ b/cache/MemcacheCache.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Cache
  * @since 2010-03-04
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class MemcacheCache extends Cache
diff --git a/captcha/Captcha.php b/captcha/Captcha.php
index d843c20..6f949be 100644
--- a/captcha/Captcha.php
+++ b/captcha/Captcha.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage captcha
  * @since 2010-04-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Captcha
diff --git a/captcha/CaptchaImageAction.php b/captcha/CaptchaImageAction.php
index b551295..c3d42dc 100644
--- a/captcha/CaptchaImageAction.php
+++ b/captcha/CaptchaImageAction.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage captcha
  * @since 2010-04-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class CaptchaImageAction
diff --git a/captcha/CaptchaValidator.php b/captcha/CaptchaValidator.php
index 4638655..6a75182 100644
--- a/captcha/CaptchaValidator.php
+++ b/captcha/CaptchaValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class CaptchaValidator extends Validator
diff --git a/classes/Env.class.php b/classes/Env.class.php
index 062c6fd..1b04117 100644
--- a/classes/Env.class.php
+++ b/classes/Env.class.php
@@ -7,8 +7,6 @@
  * @package Majestic
  * @subpackage env
  * @since
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Env
diff --git a/classes/Format.class.php b/classes/Format.class.php
index f5c6b06..b1d7c5c 100644
--- a/classes/Format.class.php
+++ b/classes/Format.class.php
@@ -7,8 +7,6 @@
  * @package Majestic
  * @subpackage Core
  * @since 24.12.2008
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 /**
diff --git a/classes/User.class.php b/classes/User.class.php
index 06ff07f..b7b506a 100644
--- a/classes/User.class.php
+++ b/classes/User.class.php
@@ -7,8 +7,6 @@
  * @package Majestic
  * @subpackage Decorator
  * @since
- * @version SVN: $Id$
- * @filesource $URL$
  */
 class User
 {
diff --git a/exception/ErrorHandler.php b/exception/ErrorHandler.php
index 058f9f6..d38714b 100644
--- a/exception/ErrorHandler.php
+++ b/exception/ErrorHandler.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage exception
  * @since 2010-02-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class ErrorHandler
diff --git a/exception/GeneralException.php b/exception/GeneralException.php
index 41c3bd3..07faa1b 100644
--- a/exception/GeneralException.php
+++ b/exception/GeneralException.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage exception
  * @since 2010-02-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class GeneralException extends Exception {}
\ No newline at end of file
diff --git a/form/Form.php b/form/Form.php
index ea4d233..fd061b9 100644
--- a/form/Form.php
+++ b/form/Form.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage form
  * @since 2010-04-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Form
diff --git a/form/FormField.php b/form/FormField.php
index 2e8a345..99683b6 100644
--- a/form/FormField.php
+++ b/form/FormField.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage form
  * @since 2010-04-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class FormField
diff --git a/form/FormViewHelper.php b/form/FormViewHelper.php
index 60dcb77..f55b515 100644
--- a/form/FormViewHelper.php
+++ b/form/FormViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Form
  * @since 2010-04-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class FormViewHelper extends ViewHelper
diff --git a/i18n/I18N.php b/i18n/I18N.php
index 2dd043a..eceb123 100644
--- a/i18n/I18N.php
+++ b/i18n/I18N.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Model
  * @since 2010-02-23
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class I18N
diff --git a/layout/Error.layout.php b/layout/Error.layout.php
index 62ed7ce..f773cfb 100644
--- a/layout/Error.layout.php
+++ b/layout/Error.layout.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Layout
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class ErrorLayout extends Layout
diff --git a/layout/Layout.php b/layout/Layout.php
index ee75ac1..a85dd10 100644
--- a/layout/Layout.php
+++ b/layout/Layout.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Layout
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Layout
diff --git a/mail/Mailer.php b/mail/Mailer.php
index 61e2a2e..97e7bd4 100644
--- a/mail/Mailer.php
+++ b/mail/Mailer.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage mail
  * @since 2010-04-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Mailer
diff --git a/model/Db.php b/model/Db.php
index 933b011..df0ec5b 100644
--- a/model/Db.php
+++ b/model/Db.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Db
diff --git a/model/DbDriver.php b/model/DbDriver.php
index f8f6f0e..8042b0f 100644
--- a/model/DbDriver.php
+++ b/model/DbDriver.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class DbDriver
diff --git a/model/DbExpr.php b/model/DbExpr.php
index 413d44d..1d5e84f 100644
--- a/model/DbExpr.php
+++ b/model/DbExpr.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-19
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class DbExpr
diff --git a/model/DbStatement.php b/model/DbStatement.php
index 9ee5feb..6dbbf2c 100644
--- a/model/DbStatement.php
+++ b/model/DbStatement.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-19
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class DbStatement
diff --git a/model/Model.php b/model/Model.php
index 7af41aa..f063d17 100644
--- a/model/Model.php
+++ b/model/Model.php
@@ -8,8 +8,6 @@
  * @package Majestic
  * @subpackage Model
  * @since 2010-02-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Model
diff --git a/model/MySQLiDriver.php b/model/MySQLiDriver.php
index 179815e..dc44478 100644
--- a/model/MySQLiDriver.php
+++ b/model/MySQLiDriver.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-17
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 /**
diff --git a/model/MySQLiStatement.php b/model/MySQLiStatement.php
index 5700d80..420f050 100644
--- a/model/MySQLiStatement.php
+++ b/model/MySQLiStatement.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage db
  * @since 2010-02-19
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 /**
diff --git a/redis/RedisManager.php b/redis/RedisManager.php
index b329f11..4c8479f 100644
--- a/redis/RedisManager.php
+++ b/redis/RedisManager.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Redis
  * @since 2010-07-17
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class RedisManager
diff --git a/session/Session.model.php b/session/Session.model.php
index 769be5e..72e1f73 100644
--- a/session/Session.model.php
+++ b/session/Session.model.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage Session
  * @since 2010-02-28
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class SessionModel extends SqlModel
diff --git a/session/Session.php b/session/Session.php
index b2546fd..9af7724 100644
--- a/session/Session.php
+++ b/session/Session.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage session
  * @since 2010-03-14
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Session
diff --git a/tests/form/FormFieldTest.php b/tests/form/FormFieldTest.php
index 07e932d..3c9baba 100644
--- a/tests/form/FormFieldTest.php
+++ b/tests/form/FormFieldTest.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage form
  * @since 2010-04-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 require_once dirname(__FILE__) . '/../../validator/iValidator.php';
diff --git a/util/AutoloadBuilder.php b/util/AutoloadBuilder.php
index 1d1dad7..14e4d2c 100644
--- a/util/AutoloadBuilder.php
+++ b/util/AutoloadBuilder.php
@@ -7,8 +7,6 @@
  * @package Majestic
  * @subpackage util
  * @since 2010-02-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 /**
diff --git a/util/profiler/CommandProfiler.php b/util/profiler/CommandProfiler.php
index 6837692..21f97be 100644
--- a/util/profiler/CommandProfiler.php
+++ b/util/profiler/CommandProfiler.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage util
  * @since 2010-03-09
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class CommandProfiler
diff --git a/util/profiler/Profiler.php b/util/profiler/Profiler.php
index 6ad272c..e72fb8a 100644
--- a/util/profiler/Profiler.php
+++ b/util/profiler/Profiler.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage util
  * @since 2010-03-09
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class Profiler
diff --git a/validator/EmailValidator.php b/validator/EmailValidator.php
index fc83b6c..78c0731 100644
--- a/validator/EmailValidator.php
+++ b/validator/EmailValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class EmailValidator extends RegexValidator
diff --git a/validator/EqualValidator.php b/validator/EqualValidator.php
index feda85a..961672f 100644
--- a/validator/EqualValidator.php
+++ b/validator/EqualValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class EqualValidator extends Validator
diff --git a/validator/NotEmptyValidator.php b/validator/NotEmptyValidator.php
index a9e62b6..13bded2 100644
--- a/validator/NotEmptyValidator.php
+++ b/validator/NotEmptyValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class NotEmptyValidator extends Validator
diff --git a/validator/RegexValidator.php b/validator/RegexValidator.php
index 4bf322d..a198db4 100644
--- a/validator/RegexValidator.php
+++ b/validator/RegexValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-26
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class RegexValidator extends Validator
diff --git a/validator/Validator.php b/validator/Validator.php
index b50c132..3f875b9 100644
--- a/validator/Validator.php
+++ b/validator/Validator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-24
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class Validator implements iValidator
diff --git a/validator/iValidator.php b/validator/iValidator.php
index 66bae7c..2130ad6 100644
--- a/validator/iValidator.php
+++ b/validator/iValidator.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage validator
  * @since 2010-04-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 interface iValidator
diff --git a/view/helpers/BreadcrumbViewHelper.php b/view/helpers/BreadcrumbViewHelper.php
index 10f8122..defa0ba 100644
--- a/view/helpers/BreadcrumbViewHelper.php
+++ b/view/helpers/BreadcrumbViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class BreadcrumbViewHelper extends ViewHelper
diff --git a/view/helpers/GetViewHelper.php b/view/helpers/GetViewHelper.php
index d0d488b..430d342 100644
--- a/view/helpers/GetViewHelper.php
+++ b/view/helpers/GetViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-09
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class GetViewHelper extends ViewHelper
diff --git a/view/helpers/HeadViewHelper.php b/view/helpers/HeadViewHelper.php
index f797056..761383d 100644
--- a/view/helpers/HeadViewHelper.php
+++ b/view/helpers/HeadViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class HeadViewHelper extends ViewHelper
diff --git a/view/helpers/MsgViewHelper.php b/view/helpers/MsgViewHelper.php
index 8a1e335..0a2b89f 100644
--- a/view/helpers/MsgViewHelper.php
+++ b/view/helpers/MsgViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-09
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class MsgViewHelper extends ViewHelper
diff --git a/view/helpers/TitleViewHelper.php b/view/helpers/TitleViewHelper.php
index 56fd7c7..d69dca2 100644
--- a/view/helpers/TitleViewHelper.php
+++ b/view/helpers/TitleViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-16
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 class TitleViewHelper extends ViewHelper
diff --git a/view/helpers/ViewHelper.php b/view/helpers/ViewHelper.php
index 59a52cb..a092228 100644
--- a/view/helpers/ViewHelper.php
+++ b/view/helpers/ViewHelper.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-03-09
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 abstract class ViewHelper
diff --git a/view/iView.php b/view/iView.php
index b471c03..82c9733 100644
--- a/view/iView.php
+++ b/view/iView.php
@@ -5,8 +5,6 @@
  * @package Majestic
  * @subpackage View
  * @since 2010-02-25
- * @version SVN: $Id$
- * @filesource $URL$
  */
 
 interface iView