diff --git a/index.php b/index.php
index fdf42ab54e10fcc2410a4858a5121e4c25fc4fcd..df538e319b783ceb69bfdaafcfe28328ad54c742 100644
--- a/index.php
+++ b/index.php
@@ -30,8 +30,6 @@
  * Basically this is the "index.php" script which all requests for TYPO3 delivered pages goes to in the frontend (the website)
  *
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage tslib
  */
 
 	// We use require instead of require_once here so we get a fatal error if classes/Bootstrap.php is accidentally included twice
diff --git a/t3lib/class.t3lib_ajax.php b/t3lib/class.t3lib_ajax.php
index e4233b0acd5e7b11cfddf14fa90408503dfbd575..033e8509ecd3e8672d43d59765359832bcbfa2ad 100644
--- a/t3lib/class.t3lib_ajax.php
+++ b/t3lib/class.t3lib_ajax.php
@@ -38,8 +38,6 @@
  * (2) generation of XML data as a reply
  *
  * @author Sebastian Kurfürst <sebastian@garbage-group.de>
- * @package TYPO3
- * @subpackage t3lib
  * @deprecated since 6.0, the class will be removed from core with 6.2
  */
 class t3lib_ajax {
diff --git a/t3lib/class.t3lib_formmail.php b/t3lib/class.t3lib_formmail.php
index 1643dfc4257fb4f495166fb8d0244f2c98b87806..58c43cfc1ed64921e6342205e6750ddf0e7290cb 100644
--- a/t3lib/class.t3lib_formmail.php
+++ b/t3lib/class.t3lib_formmail.php
@@ -35,8 +35,6 @@
  * Formmail class, used by the TYPO3 "cms" extension (default frontend) to send email forms.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see tslib_fe::sendFormmail(), t3lib/formmail.php
  * @TODO: Deprecate this class
  */
diff --git a/t3lib/class.t3lib_install.php b/t3lib/class.t3lib_install.php
index beafd2511d11df06daa3980a695e77e8244038c3..92a86e7c85e7a20f243d66ccfd9ce616ff5d7d9a 100644
--- a/t3lib/class.t3lib_install.php
+++ b/t3lib/class.t3lib_install.php
@@ -33,8 +33,6 @@
  * Class to setup values in localconf.php and verify the TYPO3 DB tables/fields
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @deprecated since 6.0, will be removed by 7.0
  */
 class t3lib_install {
diff --git a/t3lib/class.t3lib_readmail.php b/t3lib/class.t3lib_readmail.php
index 367766af5afb6b1b49062cf70df4717cf9408279..9847aa262440cd991382d37cd387364d277ef767 100644
--- a/t3lib/class.t3lib_readmail.php
+++ b/t3lib/class.t3lib_readmail.php
@@ -36,8 +36,6 @@
  * The class is still just a bunch of miscellaneous functions used to read content out of emails
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class t3lib_readmail {
 
diff --git a/t3lib/class.t3lib_syntaxhl.php b/t3lib/class.t3lib_syntaxhl.php
index ec0e58456c2813370695a45194e90a3dec99cbb7..61e23587f37a5451e9ffe11acf8eef3f4327aee4 100644
--- a/t3lib/class.t3lib_syntaxhl.php
+++ b/t3lib/class.t3lib_syntaxhl.php
@@ -33,8 +33,6 @@
  * Syntax Highlighting class.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class t3lib_syntaxhl {
 
diff --git a/t3lib/class.t3lib_userauthgroup.php b/t3lib/class.t3lib_userauthgroup.php
index 5398ae583188535afb0afd309b0f483ade859c94..0eaec1d1d5e609fc1ef674af45f95adc349d96de 100644
--- a/t3lib/class.t3lib_userauthgroup.php
+++ b/t3lib/class.t3lib_userauthgroup.php
@@ -31,8 +31,6 @@
  * In fact the two classes t3lib_beuserauth and this class could just as well be one, single class since t3lib_userauthgroup is not - to my knowledge - used separately elsewhere. But for historical reasons they are two separate classes.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @deprecated since 6.0, will be removed in 6.2. The functionality was merged wih t3lib_beUserAuth
  */
 abstract class t3lib_userAuthGroup extends t3lib_userAuth {
diff --git a/t3lib/class.t3lib_xml.php b/t3lib/class.t3lib_xml.php
index 17104daf46cdd0c099c6cb4e04d58715cc157bdf..c897fc325fba8d54b891a50e13262e9397dc472a 100644
--- a/t3lib/class.t3lib_xml.php
+++ b/t3lib/class.t3lib_xml.php
@@ -29,8 +29,6 @@
  * Doesn't contain a lot of advanced features - pretty straight forward, practical stuff
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @deprecated since TYPO3 6.0. It will be removed with TYPO3 6.2, please use other xml helper solutions instead.
  */
 class t3lib_xml {
diff --git a/t3lib/js/extjs/ux/flashmessages.js b/t3lib/js/extjs/ux/flashmessages.js
index b4f3df21dd575f37069d9a0a40985c7e601b7c66..490c2b1f781e426b67e8446d5d6f4ddc9780775b 100644
--- a/t3lib/js/extjs/ux/flashmessages.js
+++ b/t3lib/js/extjs/ux/flashmessages.js
@@ -26,8 +26,6 @@
  *
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 Ext.ns('TYPO3');
 
diff --git a/t3lib/stddb/DefaultConfiguration.php b/t3lib/stddb/DefaultConfiguration.php
index 3efe424547f983c2bfa37b1bcf082533b63bba22..f5546c32f4ac08025114ccabbd464ca2a78d3ec7 100644
--- a/t3lib/stddb/DefaultConfiguration.php
+++ b/t3lib/stddb/DefaultConfiguration.php
@@ -26,8 +26,6 @@
  * later populated as $GLOBALS['TYPO3_CONF_VARS']
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage core
  */
 return array(
 	'GFX' => array(
diff --git a/typo3/ajax.php b/typo3/ajax.php
index ddc1b248b64d6340686911558eae0f2fc488dea5..b5accaadcc14a83d6ddc8a997dd0e4bbf423e934 100644
--- a/typo3/ajax.php
+++ b/typo3/ajax.php
@@ -28,8 +28,6 @@
  * AJAX dispatcher
  *
  * @author Benjamin Mack <mack@xnos.org>
- * @package TYPO3
- * @subpackage core
  */
 $TYPO3_AJAX = TRUE;
 // Include t3lib_div at this time to get the GET/POST methods it provides
diff --git a/typo3/class.browse_links.php b/typo3/class.browse_links.php
index 878fc5e7b50640cc6a512d360906450b46a06dc6..97fb7d0dc439ebd6ce6e4d4012bd549d1fd1a1a6 100644
--- a/typo3/class.browse_links.php
+++ b/typo3/class.browse_links.php
@@ -9,8 +9,6 @@ require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('backen
  * Class which generates the page tree
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class localPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 
@@ -147,8 +145,6 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
  * Page tree for the RTE - totally the same, no changes needed. (Just for the sake of beauty - or confusion... :-)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class rtePageTree extends localPageTree {
 
@@ -159,8 +155,6 @@ class rtePageTree extends localPageTree {
  * For TBE record browser
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class TBE_PageTree extends localPageTree {
 
@@ -203,8 +197,6 @@ class TBE_PageTree extends localPageTree {
  * also used for the linkpicker on files
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class localFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
 
@@ -280,8 +272,6 @@ class localFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
  * Folder tree for the RTE - totally the same, no changes needed. (Just for the sake of beauty - or confusion... :-)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class rteFolderTree extends localFolderTree {
 
@@ -292,8 +282,6 @@ class rteFolderTree extends localFolderTree {
  * For TBE File Browser
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class TBE_FolderTree extends localFolderTree {
 
diff --git a/typo3/db_new.php b/typo3/db_new.php
index 6110c407861055bb95dcd692aa98cc8da3cf48ff..1b4cd85bba4f48e9e6a99bba42dcce9194f07acc 100644
--- a/typo3/db_new.php
+++ b/typo3/db_new.php
@@ -42,8 +42,6 @@ $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
  * Extension for the tree class that generates the tree of pages in the page-wizard mode
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class localPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
 
diff --git a/typo3/init.php b/typo3/init.php
index 7f221e4b60d6eb46a4deb5fea5f9472dce1ebb0e..698e85429145c4c20ff0075fc96241618933bba2 100644
--- a/typo3/init.php
+++ b/typo3/init.php
@@ -50,8 +50,6 @@
  * please refer to the document "Inside TYPO3"
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 define('TYPO3_MODE', 'BE');
 
diff --git a/typo3/install/index.php b/typo3/install/index.php
index 97c11b17e0aa86f7cbb0eafa6f3354b75cd57dba..d8db4ddd20464196708c7b33bd953c86fe3701ef 100755
--- a/typo3/install/index.php
+++ b/typo3/install/index.php
@@ -28,8 +28,6 @@
  * Starter-script for install screen
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 ob_start();
 define('TYPO3_MODE', 'BE');
diff --git a/typo3/login_frameset.php b/typo3/login_frameset.php
index 126e7d9b6db6620718b49bcc0ba78f35d1e8cbca..e9deebc56909b430f4aebc08a582aba631a4af48 100644
--- a/typo3/login_frameset.php
+++ b/typo3/login_frameset.php
@@ -32,8 +32,6 @@
  * XHTML-frames compatible.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 define('TYPO3_PROCEED_IF_NO_USER', 1);
 require 'init.php';
diff --git a/typo3/move_el.php b/typo3/move_el.php
index 3a73850dfe62a12cabda99029b735745d6d81064..d97899f40323d0f020dfa38970bfc1bc83babb3b 100644
--- a/typo3/move_el.php
+++ b/typo3/move_el.php
@@ -41,8 +41,6 @@ $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
  * Local extension of the page tree class
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class localPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
 
@@ -64,8 +62,6 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
  * Extension of position map for pages
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ext_posMap_pages extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
@@ -118,8 +114,6 @@ class ext_posMap_pages extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
  * Extension of position map for content elements
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ext_posMap_tt_content extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
diff --git a/typo3/show_item.php b/typo3/show_item.php
index bec6ca067d9b54b7a8113f6c70f66832a5f6a476..ce567cac4ca41939f50adeaca1b32f4140500769 100644
--- a/typo3/show_item.php
+++ b/typo3/show_item.php
@@ -30,8 +30,6 @@ require_once 'init.php';
  * Extension of transfer data class
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class transferData extends \TYPO3\CMS\Backend\Form\DataPreprocessor {
 
diff --git a/typo3/sysext/about/Classes/Controller/AboutController.php b/typo3/sysext/about/Classes/Controller/AboutController.php
index c83574c5941e89cd12c72f0765669081e9b0dce1..c2b917c3c847aa3786dd98996b6cb1a5cb7c380c 100644
--- a/typo3/sysext/about/Classes/Controller/AboutController.php
+++ b/typo3/sysext/about/Classes/Controller/AboutController.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\About\Controller;
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Steffen Kamper <steffen@typo3.org>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage about
  */
 class AboutController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/about/Classes/CustomSectionsInterface.php b/typo3/sysext/about/Classes/CustomSectionsInterface.php
index d4975fbc98f081dfee36944ebf1fcd4c75a0610a..f9ceb6f9121eb95b2773fb21d690289612fa2a01 100644
--- a/typo3/sysext/about/Classes/CustomSectionsInterface.php
+++ b/typo3/sysext/about/Classes/CustomSectionsInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\About;
  * Interface for custom sections
  *
  * @author Steffen Kamper <steffen@typo3.org>
- * @package TYPO3
- * @subpackage about
  */
 interface CustomSectionsInterface
 {
diff --git a/typo3/sysext/about/Classes/Domain/Model/Extension.php b/typo3/sysext/about/Classes/Domain/Model/Extension.php
index 3470f5a3e96acde2b50386b523ceb077006fae9f..dc974c8b9ac73f27288f0262c885391a498925f4 100644
--- a/typo3/sysext/about/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/about/Classes/Domain/Model/Extension.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\About\Domain\Model;
 /**
  * An extension helper model to be used in ext:about context
  *
- * @package TYPO3
- * @subpackage about
  * @entity
  * @author Felix Kopp <felix-source@phorax.com>
  */
diff --git a/typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php
index cf1160a1dd4f494d1b88da568094f8f9a3f41ebc..d5adf53ccabfad4d0eea3af000d69fcf94ecfaee 100644
--- a/typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/about/Classes/Domain/Repository/ExtensionRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\About\Domain\Repository;
 /**
  * Repository for Tx_About_Domain_Model_Extension
  *
- * @package TYPO3
- * @subpackage about
  * @author Felix Kopp <felix-source@phorax.com>
  */
 class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
diff --git a/typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php b/typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php
index 210531efc41d7f67fc6708ccd5836901ea02ac8e..81fe63b1de4e20a206ca63f8f85ead2e97a8c413 100644
--- a/typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php
+++ b/typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Aboutmodules\Controller;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage aboutmodules
  */
 class ModulesController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/aboutmodules/Classes/Utility/FunctionsUtility.php b/typo3/sysext/aboutmodules/Classes/Utility/FunctionsUtility.php
index 978ae49191fc6a13327792a0c3fe8323de5166df..12640ccbb72063e267d1882210d7e657b09de439 100644
--- a/typo3/sysext/aboutmodules/Classes/Utility/FunctionsUtility.php
+++ b/typo3/sysext/aboutmodules/Classes/Utility/FunctionsUtility.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Aboutmodules\Utility;
  * Basically it traverses the module structure and generates output based on that.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @deprecated since 4.7, will be removed in 6.1
  */
 class FunctionsUtility {
diff --git a/typo3/sysext/adodb/Classes/View/CheckConnectionWizardView.php b/typo3/sysext/adodb/Classes/View/CheckConnectionWizardView.php
index 2bc843f3859bcb78e68dc1d6b7c1adbb47c7dd9a..70053f51ea6634c6249f0324b4d7eae336ff2abd 100644
--- a/typo3/sysext/adodb/Classes/View/CheckConnectionWizardView.php
+++ b/typo3/sysext/adodb/Classes/View/CheckConnectionWizardView.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Adodb\View;
  * Script Class checking the connection to an ADODB handled database
  *
  * @author Robert Lemke <robert@typo3.org>
- * @package TYPO3
- * @subpackage adodb
  */
 class CheckConnectionWizardView {
 
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index 7b36f7605870023d04d986358f355b7ff8c6d91f..3f90938209aea3e7ac8face993b27c06a1e8adee 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -7,8 +7,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  * Class for generating the click menu
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @internal
  */
 class ClickMenu {
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index d78d1b15a9d27e107988ea2187916fefd352197a..4cf7fd1341d53986ba2bd8d8e3efe93d6687ad44 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Backend\Clipboard;
  * TYPO3 clipboard for records and files
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Clipboard {
 
diff --git a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
index 7fec459e0d629914248fe819cee0dab2ec7c085c..7da136edc719399da81e531b14fe66c72990c734 100644
--- a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
+++ b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Backend\Configuration;
  * Contains translation tools
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TranslationConfigurationProvider {
 
diff --git a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
index b13bf5ba7d294457fa3566dc1271ed327ac1ab05..4da00dcdc8757bed8b1be45fdaac6e36e89b1b20 100644
--- a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
+++ b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Configuration;
  * A TS-Config parsing class which performs condition evaluation
  *
  * @author Kraft Bernhard <kraftb@kraftb.at>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TsConfigParser extends \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser {
 
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index b8c395a4865486e9c24fcfe6b85197c5a804d570..f8d1af8d17110e6993210f50bb04f786ee6d3e22 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching;
  * Matches browserinfo, IPnumbers for use with templates
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenu.php b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenu.php
index 65c04569daee32cca57263af42a88b4b2898e5c0..e178286f8dbdc5e964c5a0124dc2feb8ba7b1bc2 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenu.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenu.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu;
  * Abstract Context Menu
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractContextMenu {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
index 8f17c3d112269c379d574c744dac309d7c16af11..b234e1ef05f454dc57333e69fbd1eed2300728d0 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu;
  * Abstract Context Menu Data Provider
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractContextMenuDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
index 31c3dc4acdf923d160d0b51aab59b4efb7d3f65b..6619dd27acdfc28a19af1c90852c9d19a58683fc 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu;
  * Context Menu Action
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ContextMenuAction {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuActionCollection.php b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuActionCollection.php
index 7630fac5c60e921b6f1b23fb59caa4ddb64d674f..93f75aa9d555646445eec1312a32bc89b214a365 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuActionCollection.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuActionCollection.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu;
  * Context Menu Action Collection
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ContextMenuActionCollection extends \ArrayObject {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php b/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
index c22ea7443522a8258564a0e6ee2566b1a38346a5..95357f3b6fcdc5ee69179a62c376b58646dce4a8 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/Extdirect/AbstractExtdirectContextMenu.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Backend\ContextMenu\Extdirect;
  * for adding specific purposes.
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractExtdirectContextMenu extends \TYPO3\CMS\Backend\ContextMenu\AbstractContextMenu {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/Pagetree/ContextMenuDataProvider.php b/typo3/sysext/backend/Classes/ContextMenu/Pagetree/ContextMenuDataProvider.php
index 6d15d467effc2cf967750133b11784660174c9d1..76e9070be4a2079f0d43851ef85611f05e8cd7ed 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/Pagetree/ContextMenuDataProvider.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/Pagetree/ContextMenuDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu\Pagetree;
  * Context Menu Data Provider for the Page Tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ContextMenuDataProvider extends \TYPO3\CMS\Backend\ContextMenu\AbstractContextMenuDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/Pagetree/Extdirect/ContextMenuConfiguration.php b/typo3/sysext/backend/Classes/ContextMenu/Pagetree/Extdirect/ContextMenuConfiguration.php
index 79a21b120ed2b137b79821e08b6c502b76289b17..dcb32dc58c559cb0c546c68babb1a7450226bc3f 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/Pagetree/Extdirect/ContextMenuConfiguration.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/Pagetree/Extdirect/ContextMenuConfiguration.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu\Pagetree\Extdirect;
  * Context Menu of the Page Tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ContextMenuConfiguration extends \TYPO3\CMS\Backend\ContextMenu\Extdirect\AbstractExtdirectContextMenu {
 
diff --git a/typo3/sysext/backend/Classes/ContextMenu/Renderer/AbstractContextMenuRenderer.php b/typo3/sysext/backend/Classes/ContextMenu/Renderer/AbstractContextMenuRenderer.php
index 1e9c4818bb82516e504bf3ede67388c37b7ebf08..f4892f19d10247486bd3ad5c1c1b57b23a35fe6d 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/Renderer/AbstractContextMenuRenderer.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/Renderer/AbstractContextMenuRenderer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\ContextMenu\Renderer;
  * Abstract Context Menu Renderer
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractContextMenuRenderer {
 
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index d46330914144afc888d2232d42946d651883ce73..6f1ff02c408e357579a1423a5d559c5f711d8ec9 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Class for rendering the TYPO3 backend version 4.2+
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
  */
 class BackendController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
index 21d511c4e9c87f253fee17d1666b7975a39a6e7c..34988b76bb439666f1560250036e7a23ae2daf8b 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for grid wizard
  *
  * @author T3UXW09 Team1 <modernbe@cybercraft.de>
- * @package TYPO3
- * @subpackage core
  */
 class BackendLayoutWizardController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
index 766ce70a2b504c8328cc99ef8915534579ecedb3..ea7e5d7ab28539b360fffc44b27ca12568882952 100644
--- a/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
+++ b/typo3/sysext/backend/Classes/Controller/ClickMenuController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for the Context Sensitive Menu in TYPO3 (rendered in top frame, normally writing content dynamically to list frames).
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @see template::getContextMenuCode()
  */
 class ClickMenuController {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
index 104ac73bed7312c890820a71f5ee46b2124f3fa5..bf6460f7e5f455f932e34330a4f794df9b00a65d 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\ContentElement;
  * Script Class for showing the history module of TYPO3s backend
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @see class.show_rechis.inc
  */
 class ElementHistoryController {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 911b733b51599635110d24c52ffbee0abe2a12e9..26d47d04f544a8bc8a0c0a17c67bd9af1a445cd8 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\ContentElement;
  * Script Class for showing information about an item.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ElementInformationController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
index 03153cd4426b3c2ddda3da9663dd8d379134abd0..c3c2610d432f2f56433d84a6845aacb9ab390497 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\ContentElement;
  * Script Class for rendering the move-element wizard display
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class MoveElementController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
index 669fd28423727ff22b2056992c7bb48d7bd21f09..3e20fb226b611fc74ad94325730ccf6f3fddc6b7 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\ContentElement;
  * Script Class for the New Content element wizard
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class NewContentElementController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/DummyController.php b/typo3/sysext/backend/Classes/Controller/DummyController.php
index 4153b5d594567b6c5ba54536816a3f50041dd2bb..76e0bb67e17e980e81f32d137cbf11f5cfd43a51 100644
--- a/typo3/sysext/backend/Classes/Controller/DummyController.php
+++ b/typo3/sysext/backend/Classes/Controller/DummyController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class, creating the content for the dummy script - which is just blank output.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class DummyController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 35ebe6b32c9c2584a5dd24c74f20f2470f2419ec..e5e1a684085b9ea12675949d6cb4beccbb65e4bd 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Notice: It does NOT use tce_db.php to submit data to, rather it handles submissions itself
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class EditDocumentController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
index c79cf343b2610b3f8623ee4eb0dc21109224cf8f..066868d35bb072e5d9ab4a0e3d54c01ab061b8d2 100644
--- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\File;
  * Script Class for the create-new script; Displays a form for creating up to 10 folders or one new text file
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class CreateFolderController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index 68399c81aec7193127748bdc9759dd036b13866b..f5e1d1fb4114a5c9ef52cb4f3d8c225f49c81c28 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\File;
  * Script Class for rendering the file editing screen
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class EditFileController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileController.php b/typo3/sysext/backend/Classes/Controller/File/FileController.php
index bf3d1f78bdc7277a777956cfaf544bdfb1a82ad6..a210afd1cb9fa794fac7ac789694fce9fce7dd26 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileController.php
@@ -46,8 +46,6 @@ namespace TYPO3\CMS\Backend\Controller\File;
  * Script Class, handling the calling of methods in the file admin classes.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FileController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index f17c1b0feffc046e5ecc6010b852e6edfeb59ba3..ab876f8c6295bc758c472cf93578e9efab7a8213 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\File;
  * Script Class for display up to 10 upload fields
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FileUploadController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
index 8b961e0c97bea9a61221fa702da9d2fbb007a65e..ae520148acc83dac157e3d6a0669f12d542c9f9d 100644
--- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\File;
  * Script Class for the rename-file form.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class RenameFileController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
index 9b2c99aaa4c89739cae5d12e13919ae3054c335a..c982f8d9c9e8f74eac462962b47f1218e7c5cb47 100644
--- a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
+++ b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Main script class for rendering of the folder tree
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FileSystemNavigationFrameController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/ListFrameLoaderController.php b/typo3/sysext/backend/Classes/Controller/ListFrameLoaderController.php
index 09df0d767525e8ce72720e1715e54092a40d90a9..ab6ad93a16ba7dd40da8b5462643d9aa0de81971 100644
--- a/typo3/sysext/backend/Classes/Controller/ListFrameLoaderController.php
+++ b/typo3/sysext/backend/Classes/Controller/ListFrameLoaderController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for redirecting shortcut actions to the correct script
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ListFrameLoaderController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php
index 1fcc2528c90e078a0c1b29f14884bcb1e84b7568..51e77c34ed13b618d645c6bbd1c4384ebf9c2331 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for rendering the login form
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class LoginController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php b/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
index 6cc7560cf9c7c12d027f09fc862c6b14fe3e788a..c7487c743fcaa29d9a4dba1efc875cc6182f9d58 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class, putting the frameset together.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class LoginFramesetController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/LogoutController.php b/typo3/sysext/backend/Classes/Controller/LogoutController.php
index 168941dad6df5cc2f4e95022a85a65a295e05741..bd3da77e5f8fd37d8304e0b8e63b598ebea34417 100644
--- a/typo3/sysext/backend/Classes/Controller/LogoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/LogoutController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Does not display any content, just calls the logout-function for the current user and then makes a redirect.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class LogoutController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index 9a2835d404393470edff57c65804280d5d7dbb2e..551da0bbd2e84cc994c997eff7de503acfbda7de 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script class for 'db_new'
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class NewRecordController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/NoDocumentsOpenController.php b/typo3/sysext/backend/Classes/Controller/NoDocumentsOpenController.php
index 3b88d309c9ab7c4fef394930a524f9bbd37a05b3..5668c00c097f02ce2f0c5d67a4bb3c773aaa93f3 100644
--- a/typo3/sysext/backend/Classes/Controller/NoDocumentsOpenController.php
+++ b/typo3/sysext/backend/Classes/Controller/NoDocumentsOpenController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for the "No-doc" display; This shows most recently edited records.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class NoDocumentsOpenController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index c2d1e5f3bf2de4b49de20511bdad37e1f5dbe772..c7c2b9c0b2b928300d71514f034d245460dd1523 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for Web > Layout module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class PageLayoutController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
index 722d58df7b03c1952eede4d64b3dca4f91f1d09f..c66dc296c5167ddaf1233035e2d0f6f3bc3c98fc 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Main script class for the page tree navigation frame
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class PageTreeNavigationController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php b/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php
index bff488d53e4aab4413b249e2dcf8e2c6fcbc8d70..38054528020db37ff30fd0318bc60210c6a2bc7a 100644
--- a/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php
+++ b/typo3/sysext/backend/Classes/Controller/ShortcutFrameController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * Script Class for the shortcut frame, bottom frame of the backend frameset
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ShortcutFrameController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
index 86b6ecc29c7258968919cd6abe93786a2576b904..ba8296f3f0cd1e16314d6f6a9fa72c41cbed6dd6 100644
--- a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
+++ b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
@@ -8,8 +8,6 @@ namespace TYPO3\CMS\Backend\Controller;
  * For all other cases than alt_doc.php it is recommended to use this script for submitting your editing forms - but the best solution in any case would probably be to link your application to alt_doc.php, that will give you easy form-rendering as well.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class SimpleDataHandlerController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
index a37dd4e1a3ae6e96733843ba18a593fe38dfed7a..5ae81e6fed1ad935dd2195a9a05a93e91bb73bd9 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for adding new items to a group/select field. Performs proper redirection as needed.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class AddController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index e7acc9bc4afae6cff48eab7b874dc8a9ed18b058..094ebb72cbe1c844c4d2f7be0686b662b8e257b6 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -7,8 +7,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * @author Mathias Schreiber <schreiber@wmdb.de>
  * @author Peter Kühn <peter@kuehn.com>
  * @author Kasper Skårhøj <typo3@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ColorpickerController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
index 7a2a7188b985646d66bb3781aadcfc9dd1d48c8c..d2754deef14134ca1f449ffddff104a2ede58987 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/EditController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for redirecting a backend user to the editing form when an "Edit wizard" link was clicked in TCEforms somewhere
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class EditController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
index ad3938e5385bac416610ea4cdee6e1182f10e78d..b80f25cc81d673e08efa90b4a7419cf5a56b00f2 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
@@ -92,8 +92,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for rendering the Form Wizard
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FormsController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
index ebf1640aa6291bd19a9e6457764ddcd81e121ca1..be1d66e8cfce9167505ef57c45d1742079954af2 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ListController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for redirecting the user to the Web > List module if a wizard-link has been clicked in TCEforms
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ListController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
index 454652743ab8c4264b925707ac7df32d7721b203..fed7acac2e87dc8bbd755a64de4e0753a639b72e 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for rendering the full screen RTE display
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class RteController {
 
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
index d17cca191d3db47f72aa5d5ab9e8bc19b7e7839a..d713a30bcc71d276a42c85cfbaa7126c597033e9 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Controller\Wizard;
  * Script Class for rendering the Table Wizard
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class TableController {
 
diff --git a/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php b/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
index 7d4df68da2be15eeacf60522547014a5e32a05f6..5f02742e6d4cf3cc749193af5ad60587822d3ed8 100644
--- a/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
+++ b/typo3/sysext/backend/Classes/Domain/Model/Module/BackendModule.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Domain\Model\Module;
  * Model for menu entries
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage core
  */
 class BackendModule {
 
diff --git a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
index 68de078ff73dd683c0be9c5e16b5752e6daeddea..cc150bc238bce68e3259fbdd1bcbbb7287f51a9d 100644
--- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
+++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Domain\Repository\Module;
  * Repository for backend module menu
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage core
  */
 class BackendModuleRepository implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
index 9d9f746caf022aaa4fe52530a3ba9afac9269e04..a25cf8982e523d021468e281a1463b038f285bfa 100644
--- a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
+++ b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Backend\Form;
  * Class for getting and transforming data for display in backend forms (TCEforms)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DataPreprocessor {
 
diff --git a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
index 925ba2da9be3666508fe74f3aaacd636084bae6e..6a44b470016924d372e05a7bf2dbdb98a6f4cd84 100644
--- a/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/DatabaseFileIconsHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Form;
  * Interface for classes which hook into t3lib_TCEforms and do additional dbFileIcons processing
  *
  * @author Andy Grunwald <andreas.grunwald@wmdb.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface DatabaseFileIconsHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
index 210dedab89629eb6b6377a23231f77fec996d11c..f0d1439a8fd3400e28fcd7df2f25e3fb55d9e156 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElementHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Form\Element;
  * Interface for classes which hook into t3lib_TCEforms_inline.
  *
  * @author Oliver Hader <oh@inpublica.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface InlineElementHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index ad613d2788264f0aad4f7c110a2dab1f8151f2fc..f3e9bfd46a5c04bc342198d49c9c478ffcedf018 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Backend\Form;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @coauthor René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FormEngine {
 
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index 748635ee7d3dd9cf30bc44bb93d0c49fa0ba8274..a5207b6986eaad279c751f85934203ef3236c8c7 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Backend;
  * This includes mainly functions related to the Admin Panel
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\BackendUserAuthentication {
 
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index 7d8e8cd5152ba80d40e830a11b10add297d0688b..6ef469c214236623cc247975a48c1199b6485bbe 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Backend\History;
  * Class for the record history display script (show_rechis.php)
  *
  * @author Sebastian Kurfürst <sebastian@garbage-group.de>
- * @package TYPO3
- * @subpackage core
  */
 class RecordHistory {
 
diff --git a/typo3/sysext/backend/Classes/InterfaceState/ExtDirect/DataProvider.php b/typo3/sysext/backend/Classes/InterfaceState/ExtDirect/DataProvider.php
index 50c71f6443bcacf125faaf0e458aae213f80b576..a10a0c9d21b92d682057280adebc1d18583ee2a4 100644
--- a/typo3/sysext/backend/Classes/InterfaceState/ExtDirect/DataProvider.php
+++ b/typo3/sysext/backend/Classes/InterfaceState/ExtDirect/DataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\InterfaceState\ExtDirect;
  * ExtDirect DataProvider for State
  *
  * @author Steffen Kamper <steffen@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DataProvider {
 
diff --git a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
index 21faf0f658c6d04a0bb5d44ab33a9ff77a523112..7fbe7352f274d9ff058149e1fff266aa9851e8c5 100644
--- a/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
+++ b/typo3/sysext/backend/Classes/Module/AbstractFunctionModule.php
@@ -126,8 +126,6 @@ namespace TYPO3\CMS\Backend\Module;
  * are totally normal "submodules".
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_SCbase
  * @see tx_funcwizards_webfunc::init()
  * @see tx_funcwizards_webfunc
diff --git a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
index ffe410464b4fba7c6a4d9c5733311bc6a65390df..62adabeb8c7d3a96c2765b6dd0074550db08ec59 100644
--- a/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
+++ b/typo3/sysext/backend/Classes/Module/BaseScriptClass.php
@@ -85,8 +85,6 @@ namespace TYPO3\CMS\Backend\Module;
  * See example comment above.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_extobjbase
  */
 class BaseScriptClass {
diff --git a/typo3/sysext/backend/Classes/Module/ModuleController.php b/typo3/sysext/backend/Classes/Module/ModuleController.php
index 511584df586f6373786132dd2ae5f77bb89c8457..250ff502ba30cf7a7d60ecc83cab2dfa87ac7a5d 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleController.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Module;
  * Class with utility functions for module menu
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage core
  */
 class ModuleController {
 
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index 8e1f114390b7a6dc2d27a9711b85102d556eecf2..ba3b3ea46c6edf4e2d9711fdceba8cf6610c0ea1 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -43,8 +43,6 @@ namespace TYPO3\CMS\Backend\Module;
  * $this->loadModules->load($TBE_MODULES);
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ModuleLoader {
 
diff --git a/typo3/sysext/backend/Classes/Module/ModuleSettings.php b/typo3/sysext/backend/Classes/Module/ModuleSettings.php
index 7a32a74ee75da5179553fa069a8bc56c9875ff7e..4603ba64d4cdc1a7d17431f4ef586a755770f526 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleSettings.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleSettings.php
@@ -77,8 +77,6 @@ namespace TYPO3\CMS\Backend;
  * Provides a presets box for BE modules.
  *
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ModuleSettings {
 
diff --git a/typo3/sysext/backend/Classes/Module/ModuleStorage.php b/typo3/sysext/backend/Classes/Module/ModuleStorage.php
index bb6c6a3dd5a0ae00da20b3cf64dc36f72adcfc39..8a930a30def8a1bdbdce292685db5592676698b6 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleStorage.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleStorage.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Module;
  * Model for the module storage
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage core
  */
 class ModuleStorage implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index ea40ce7baea44c2750073609e6d27620cb5e1306..96db8bd8d464ae7f2173b7af5e846729481095bf 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Backend\RecordList;
  * modules Web>List and File>Filelist
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see typo3/db_list.php
  * @see typo3/sysext/filelist/mod1/index.php
  */
diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
index 5af791501921462eb9649a36c6c964c39146ffa8..df4bb505937b98f377f7358523342c476b15759a 100644
--- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Backend\RecordList;
  * Local version of the record list.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ElementBrowserRecordList extends \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList {
 
diff --git a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
index 9048345391ac1ea80576556d2065ba2e8929543f..16a9da9c3f3c4291fb6970d84f9f945f4466f76e 100644
--- a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
+++ b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\RecordList;
  * interface for classes which hook into localRecordList and do additional getTable processing
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface RecordListGetTableHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Rte/AbstractRte.php b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
index 13af00aced501df02d922795e171fa2bf463076e..1a058a68c1a03c379bd6fcef9982675da60580a3 100644
--- a/typo3/sysext/backend/Classes/Rte/AbstractRte.php
+++ b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Backend\Rte;
  * See "rte" extension for usage.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class AbstractRte {
 
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/ExtDirect/LiveSearchDataProvider.php b/typo3/sysext/backend/Classes/Search/LiveSearch/ExtDirect/LiveSearchDataProvider.php
index 87b8869ceb3b2d11c4d9c2d36aa2f357a02746de..9acfe0bbc91329332613f7142707090e7a8d959d 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/ExtDirect/LiveSearchDataProvider.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/ExtDirect/LiveSearchDataProvider.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Search\LiveSearch\ExtDirect;
  *
  * @author Michael Klapper <michael.klapper@aoemedia.de>
  * @author Jeff Segars <jeff@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LiveSearchDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
index 96dc466c27050855c6141902108eef84b225b732..905b7fac66eadd1e61e0c3ae55a6d873d2eeb2f7 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Search\LiveSearch;
  *
  * @author Michael Klapper <michael.klapper@aoemedia.de>
  * @author Jeff Segars <jeff@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LiveSearch {
 
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php b/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
index 2a9277ee7a1d578b04986a5caedecf1dba3fedbf..55d8c4e29a5935fc74738acf1fcfee26d3874651 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Search\LiveSearch;
  *
  * @author Michael Klapper <michael.klapper@aoemedia.de>
  * @author Jeff Segars <jeff@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class QueryParser {
 
diff --git a/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php b/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
index e9f02bea48f1e7bd2b4b251abe9da8ff0bf92b7f..45b33e8245656fdbde6013201d796b51e18270e3 100644
--- a/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
+++ b/typo3/sysext/backend/Classes/Sprite/AbstractSpriteHandler.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * Provides base functionality for all handlers.
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractSpriteHandler implements \TYPO3\CMS\Backend\Sprite\SpriteIconGeneratorInterface {
 
diff --git a/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php b/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
index 47c3f5d77e137c77ba752f87f33ddc9779d963eb..438df8aa6cc2bf58450dcac41da976f7e06702d0 100644
--- a/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
+++ b/typo3/sysext/backend/Classes/Sprite/SimpleSpriteHandler.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * Without the css classes generated here, icons of for example tca records would be empty.
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SimpleSpriteHandler extends \TYPO3\CMS\Backend\Sprite\AbstractSpriteHandler {
 
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteBuildingHandler.php b/typo3/sysext/backend/Classes/Sprite/SpriteBuildingHandler.php
index 7328208b80de3742fbb0d5ce96cc024bdde2d865..fdd4232807e929c03644cbfb31cce3f8d255dd56 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteBuildingHandler.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteBuildingHandler.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * Sprite build handler
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SpriteBuildingHandler extends \TYPO3\CMS\Backend\Sprite\AbstractSpriteHandler {
 
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
index 473610269b66926f91721a55b58d2a16725d500e..4e75396497c7826e11be32aaeeb2c14a679601d9 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * Sprite generator
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SpriteGenerator {
 
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php b/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
index 33cc5f2cb31ee891fbbe153be9bcee079598fc9f..848e557a04066860ede046f7ecbc0dcf3545c2ec 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteIconGeneratorInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * Interface all handlers in t3lib_spritemanager have to implement.
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface SpriteIconGeneratorInterface
 {
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
index c07a26e9a7fcbaad15681c976d9da13ed193370d..fd441100f3ef9c84c6f092f6242887cc648cbbb4 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Backend\Sprite;
  * A configurable handler class does the business task.
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SpriteManager {
 
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index 42d96f8698f07fcbaa4a4f1b1ae80d72e15148da..47879694b7b293e21ef0f799af0a350f11d6e29e 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -17,8 +17,6 @@ namespace TYPO3\CMS\Backend\Template;
  * Please refer to Inside TYPO3 for a discussion of how to use this API.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class DocumentTemplate {
 
diff --git a/typo3/sysext/backend/Classes/Toolbar/ClearCacheActionsHookInterface.php b/typo3/sysext/backend/Classes/Toolbar/ClearCacheActionsHookInterface.php
index cb668887a48fd00dfaacf416bcd350b370b5eb33..252eca2c0da035818d71f6900823b307581d0de6 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ClearCacheActionsHookInterface.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ClearCacheActionsHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Toolbar;
  * Interface for classes which hook into ClearCacheMenu and manipulate CacheMenuItems array
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage backend
  */
 interface ClearCacheActionsHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
index 0137e5f3a26ca8ad59544842c033c89a8d65292e..a1cc5b1f7d6c5944f13975cf90d84f0b5ef95926 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Toolbar;
  * class to render the menu for the cache clearing actions
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
  */
 class ClearCacheToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInterface {
 
diff --git a/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
index 8cd47d553ba8718e2d38cdba751fce48548053c8..f41d4a39680f6c9ccbbdd522fc375fb4869fbfbf 100644
--- a/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Toolbar;
  *
  * @author Michael Klapper <michael.klapper@aoemedia.de>
  * @author Jeff Segars <jeff@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LiveSearchToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInterface {
 
diff --git a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
index 8b8b61fa9228949c39df4f9cb60bdf505ed528ff..010efd9853cb20c4cc7b6339efdb7be80ea9fb71 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Toolbar;
  * Class to render the shortcut menu
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
  */
 class ShortcutToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInterface {
 
diff --git a/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php b/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
index f7236194b1a6c38880357e687787be72f61a64c8..5aec2e42f168511c9c12863b943b7869f9402b9e 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Toolbar;
  * Interface for classes which extend the backend by adding items to the top toolbar
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ToolbarItemHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php b/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
index dde7fb4241296a7eb5820596dd0dba2ced743250..7e84f1be9ed80f47768b7d28b016ca14abba7e26 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree;
  * Abstract ExtJS tree based on ExtDirect
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractExtJsTree extends \TYPO3\CMS\Backend\Tree\AbstractTree {
 
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractTree.php b/typo3/sysext/backend/Classes/Tree/AbstractTree.php
index 48e914f249c86b511d525450f57ceaa20d53e046..9dcd87a4357010e6214e440aa711e982a19cb47b 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractTree.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractTree.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree;
  * Abstract Tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractTree {
 
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/AbstractTreeDataProvider.php
index 80703b5a819bcaaa00dd2586e52633ac9b2282f4..38b3151055d18b5afe7575d609e6d30a8d9ec7ba 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractTreeDataProvider.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractTreeDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractTreeStateProvider.php b/typo3/sysext/backend/Classes/Tree/AbstractTreeStateProvider.php
index e6264df65f1ecb8cb0c104b047275501898c0ed2..f460c807a048e64509ade22d6996673bd2dd807e 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractTreeStateProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractTreeStateProvider.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Tree;
  * @TODO This class is incomplete, because the methods still need
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractTreeStateProvider {
 
diff --git a/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php b/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
index 5d05e2b3e5e30e7bfe15443489885bf6594c4b50..bfa703e0d0d3666b413a21a724add5454428f060 100644
--- a/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree;
  * Interface that defines the comparison of nodes
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ComparableNodeInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php b/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
index df265bc254cf2c78a553d89d6c384c89ee800470..2d8ba577a3d834abe53028beede63af4934c0979 100644
--- a/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/DraggableAndDropableNodeInterface.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface DraggableAndDropableNodeInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php b/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
index 2b36812aa44d2c414bf775c6e1577d3ea41b61d6..167fff0688807ad62a2e97ed5b288a5b1d655a0a 100644
--- a/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/EditableNodeLabelInterface.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface EditableNodeLabelInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
index f5f692dbb94839800cdcf49c2a861ea64df35b2e..f9aa203f26d0bea58a278062e785dda1124b1414 100644
--- a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
+++ b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree;
  * Node for the usage with ExtDirect and ExtJS
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
index a6f729a40a65cc62461c6fe377df92a428af64b2..0a369f5641f826032d4528a07cbfcea438540972 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Interface for classes which perform pre or post processing
  *
  * @author Tolleiv Nietsch <typo3@tolleiv.de>
- * @package 	TYPO3
- * @subpackage t3lib
  */
 interface CollectionProcessorInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index 9de8ad3c3d94976920fe34a7ffdd5156d66c9576..ebbc1e41f7c973ce0dc8aa480f5b664df3cfb9d5 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Page Tree and Context Menu Commands
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Commands {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
index 9adbed6300e9667c4aa9102bf24b29e0ccc030c3..0fc7d6483a4219d25b133b8f02476f99fb0b0541 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Page tree data provider.
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
index 51ed75bad655dcba0f069aff5c6805d9cc96025d..0c98b1f2899f91830e1fd89f362a0b45c8692e41 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Commands for the Page tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtdirectTreeCommands {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
index b29e5e270c52211590a941fbcec885fe73f8c426..bb15905c35813bc130ec35ad63931741cefbcea1 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Data Provider of the Page Tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTree {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Indicator.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Indicator.php
index 27b11b2d27a4e0127869ec0ae452136d88efea8e..2ac86aeda6f5626d2f0d46adea69638f1462d489 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Indicator.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Indicator.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Class for pagetree indicator
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Indicator {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/IndicatorProviderInterface.php b/typo3/sysext/backend/Classes/Tree/Pagetree/IndicatorProviderInterface.php
index 24dad4895cb0615a50d20fc907b9c83b99e2d9bd..e2fc3c3a87f49ba867b943a28249a647412ab471 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/IndicatorProviderInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/IndicatorProviderInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Interface for classes which provide a pagetree indicator.
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package 	TYPO3
- * @subpackage t3lib
  */
 interface IndicatorProviderInterface
 {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
index 890bc0514ca72f05e24623e9174bc424301cd522..7f59e34afcdaa393003142a80a78b86411ea45c3 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Node designated for the page tree
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNodeCollection.php
index b39ba19f35a784d5aa3fd46e0a6c1a8d755b6b03..ab4f578a2c2f0e0df7023ad32d767e95d8ae6b52 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNodeCollection.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Pagetree;
  * Tree Node Collection
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PagetreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollection {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Renderer/AbstractTreeRenderer.php b/typo3/sysext/backend/Classes/Tree/Renderer/AbstractTreeRenderer.php
index 2976c10b301f417414a92168edca10af3c6636d9..a03c53906ec969c83e2f96f2ccdbaf79d9425433 100644
--- a/typo3/sysext/backend/Classes/Tree/Renderer/AbstractTreeRenderer.php
+++ b/typo3/sysext/backend/Classes/Tree/Renderer/AbstractTreeRenderer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Renderer;
  * Abstract Renderer
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractTreeRenderer {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php b/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
index 8f49462557fc573f09a1576f155ddca1bcf0516b..c040815bde7676e3702c66535eca42871d7f30fb 100644
--- a/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
+++ b/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\Tree\Renderer;
  *
  * @author Steffen Kamper <steffen@typo3.org>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtJsJsonTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\AbstractTreeRenderer {
 
diff --git a/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php b/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
index 35c99d06cc546fff8b02c59abfe8faa5eccf3fe9..2f0dfb89c6141c91accfb2fff566225d69b247a5 100644
--- a/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
+++ b/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tree\Renderer;
  * Renderer for unordered lists
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class UnorderedListTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\AbstractTreeRenderer {
 
diff --git a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
index f0d570ad092213f3a9e4b9882f171a358a0e403e..b924107b179ea67a6a38b42e1be0e5cf2e843161 100644
--- a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollection {
 
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNode.php b/typo3/sysext/backend/Classes/Tree/TreeNode.php
index 8999973ce6fa00a207b6325ff0049b720b34ae7a..e9d275788af74bc96ecc00b9d3c2adb428522e13 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNode.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Serializable {
 
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
index d0b8265f05fbb5115230c92739f90006679c2f47..2056c92e66722089ef7e081019c8a46c84ac948b 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNodeCollection.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TreeNodeCollection extends \ArrayObject {
 
diff --git a/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php b/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
index 5cc828d11a629f5415dacbc6056a4dc3b5b3122c..71bd4870d9523c661b60d84e8ad1e9c846856e13 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeRepresentationNode.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Tree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TreeRepresentationNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
 
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 5f84a423abc34b09c8ca7f4a04cd950bd1bc9b63..506133ff41765fa09c0b6e53e0d8dcf560ca8383 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\Tree\View;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_browsetree
  * @see t3lib_pagetree
  * @see t3lib_foldertree
diff --git a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
index e86c35ebb2dda93b495c74621b483fcd92af27b6..6bd052eab8415d90b882d8d2d67d19c4d3ddc05a 100644
--- a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Backend\Tree\View;
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @coauthor René Fritz <r.fritz@colorcube.de>
  * @see t3lib_treeView, t3lib_pageTree
- * @package TYPO3
- * @subpackage t3lib
  */
 class BrowseTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index d8ca01bf85a24521080fe49e2a76c00d09ab6c09..563638098bb88141c8754b2489fdca81f262a31b 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Backend\Tree\View;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @coauthor René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  * @see class t3lib_treeView
  */
 class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index 69372452c165b5c5f1d3705cd90fef9e3fad5870..cc8219891188816078ddabb73024837be32facb3 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Backend\Tree\View;
  * Used for pages / tt_content element wizards of various kinds.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PagePositionMap {
 
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 4f1821ea3ff9a9fcff66a5ace25eddee9ebd9971..3e8c3df56f2a2762821a31d3475dce929c72f28d 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Backend\Tree\View;
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @coauthor René Fritz <r.fritz@colorcube.de>
  * @see t3lib_treeView, t3lib_browseTree
- * @package TYPO3
- * @subpackage t3lib
  */
 class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 
diff --git a/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php b/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
index 1b94a7c623d74ed8d7dc00cf9f49c0f9436f98fb..458d8eef29b1f941355de7a8ee8f4222dd4d7f10 100644
--- a/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
+++ b/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\User\ExtDirect;
  * ExtDirect DataProvider for BE User Settings
  *
  * @author Steffen Kamper <steffen@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class BackendUserSettingsDataProvider {
 
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 1f98afe82a28b6600b62a4b7d4a3eaf2c5c38c44..4d719a4bb14cc70130ffac2c04a0fad8200026d1 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Backend\Utility;
  * Eg. to get a page-record 51 do this: 't3lib_BEfunc::getRecord('pages',51)'
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class BackendUtility {
 
diff --git a/typo3/sysext/backend/Classes/Utility/IconUtility.php b/typo3/sysext/backend/Classes/Utility/IconUtility.php
index 53a273e3e04fd6257b515a160a888b2cebfdfca1..c624b024e7bbd881120e5b50389cde71d91a819c 100644
--- a/typo3/sysext/backend/Classes/Utility/IconUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/IconUtility.php
@@ -42,8 +42,6 @@ namespace TYPO3\CMS\Backend\Utility;
  * ALL functions called without making a class instance, eg. "t3lib_iconWorks::getIconImage()"
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IconUtility {
 
diff --git a/typo3/sysext/backend/Classes/View/BackendLayoutView.php b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
index 54ecc7b8b15b3bb34aef1753b0d5d242ecde53e4..c78960248b7e4df9509cfb7fa81106f9bed00353 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\View;
  * Backend layout for CMS
  *
  * @author GridView Team
- * @package TYPO3
- * @subpackage core
  */
 class BackendLayoutView {
 
diff --git a/typo3/sysext/backend/Classes/View/LogoView.php b/typo3/sysext/backend/Classes/View/LogoView.php
index 02e7cf439caac6828f6db77df08d4e52f5f6b6f5..460adf8173f0058e4396844283ce6ea1e3f68b23 100644
--- a/typo3/sysext/backend/Classes/View/LogoView.php
+++ b/typo3/sysext/backend/Classes/View/LogoView.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\View;
  * class to render the TYPO3 logo in the backend
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
  */
 class LogoView {
 
diff --git a/typo3/sysext/backend/Classes/View/ModuleMenuView.php b/typo3/sysext/backend/Classes/View/ModuleMenuView.php
index 826f60e45d020e4531eca65bdb8cfebcf9066de9..2c034c82b663c741827a2f23b6a395a79f2fe95c 100644
--- a/typo3/sysext/backend/Classes/View/ModuleMenuView.php
+++ b/typo3/sysext/backend/Classes/View/ModuleMenuView.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\View;
  * class to render the TYPO3 backend menu for the modules
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
  */
 class ModuleMenuView {
 
diff --git a/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php b/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
index 9d2bc44149bcbbb02d736f9d20f7ec8b612e13fa..4456dc9e5284a817f6a896400c7eecfebc8afdc9 100644
--- a/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
+++ b/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
@@ -30,7 +30,6 @@ namespace TYPO3\CMS\Backend\View\PageLayout\ExtDirect;
  * Commands for the Page module
  *
  * @author Jigal van Hemert <jigal.van.hemert@typo3.org>
- * @package TYPO3
  */
 class ExtdirectPageCommands {
 
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index e2b48088663ca3606317b4761772921dbbbed467..1e4073ca8ed1bb1a1b54396e509cce3ed1ff5082 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Backend\View;
  * Child class for the Web > Page module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList {
 
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
index 81afcc88fa11b1942f083f692a018790abb8896e..434e3ecc9692e20b818991e77105518685168d3b 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutViewDrawItemHookInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Backend\View;
  * tt_content_drawItem processing.
  *
  * @author Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage cms
  */
 interface PageLayoutViewDrawItemHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/View/PageTreeView.php b/typo3/sysext/backend/Classes/View/PageTreeView.php
index 99546f81dda5fc74ccf00cba7dda628ecf3dda7c..892128b535a58f973638bca1e538c5eea856e441 100644
--- a/typo3/sysext/backend/Classes/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/View/PageTreeView.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Backend\View;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Benjamin Mack <bmack@xnos.org>
- * @package TYPO3
- * @subpackage core
  * @see class t3lib_browseTree
  */
 class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
diff --git a/typo3/sysext/backend/Classes/View/ThumbnailView.php b/typo3/sysext/backend/Classes/View/ThumbnailView.php
index 56906d8bdf699eedc99799d3e39d9c1455496d2b..9a63f5e1e7b72995908f76f7d3e8ba86c88d790d 100644
--- a/typo3/sysext/backend/Classes/View/ThumbnailView.php
+++ b/typo3/sysext/backend/Classes/View/ThumbnailView.php
@@ -42,8 +42,6 @@ namespace TYPO3\CMS\Backend\View;
  * Relative paths MUST BE the first two characters ONLY: eg: '../dir/file.gif', otherwise it is expect to be absolute
  *
  * @author Kasper Skårhøj	<kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ThumbnailView {
 
diff --git a/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php b/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
index 3b03638dc37dc9483366de6f414eb7712e510e3d..cfcc2406be932483bf8d29a4e313c034d7bb32e9 100644
--- a/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
+++ b/typo3/sysext/backend/Classes/Wizard/NewContentElementWizardHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Wizard;
  * Interface for classes which hook into SC_db_new_content_el and manipulater wizardItems array
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage cms
  */
 interface NewContentElementWizardHookInterface
 {
diff --git a/typo3/sysext/backend/Classes/Wizard/TsconfigWizard.php b/typo3/sysext/backend/Classes/Wizard/TsconfigWizard.php
index 9118097df572633d81ce05a38ec6d6f818fce6c1..f97b1611a7da696710c2d1b0d5f26c8b76d63ee3 100644
--- a/typo3/sysext/backend/Classes/Wizard/TsconfigWizard.php
+++ b/typo3/sysext/backend/Classes/Wizard/TsconfigWizard.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Backend\Wizard;
  * Script Class for rendering the TSconfig/TypoScript property browser.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class TsconfigWizard {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index 39c454fd45afa15d6599041e1f8b324cb3d5d92e..b3e44b2074842f8b42f526207941830aa762a2b9 100644
--- a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Configuration\TypoScript\ConditionMatchin
  * Testcase for class \TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher.
  *
  * @author 	Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Module/ModuleControllerTest.php b/typo3/sysext/backend/Tests/Unit/Module/ModuleControllerTest.php
index 68ffd086616c1a520077560d35d18876edffe46e..2f64aef3e8248b1db27d7954b9e06b9a2b2a911f 100644
--- a/typo3/sysext/backend/Tests/Unit/Module/ModuleControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Module/ModuleControllerTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Module;
  * Test class for module menu utilities
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage backend
  */
 class ModuleControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Sprite/SpriteManagerTest.php b/typo3/sysext/backend/Tests/Unit/Sprite/SpriteManagerTest.php
index c3b7ebce0d265b06adc6b1f8739d34f98cf844d4..c4684fb0267eb080ddd88d78a722d1bb547a6c12 100644
--- a/typo3/sysext/backend/Tests/Unit/Sprite/SpriteManagerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Sprite/SpriteManagerTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Sprite;
  * Testcase for TYPO3\CMS\Backend\Sprite\SpriteManager
  *
  * @author Fabien Udriot <fabien.udriot@ecodev.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SpriteManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
index 7492ce7b945cacdc45eaa59ba7fb55aa820f680f..eaf49421a8a2a3a0b6e6c30c91ef06589e06de57 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree\Pagetree;
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DataProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php b/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
index e1066f553e374659bdc832106acf45fb3101ad28..04654abea2cfe7276d8f7059afc18eeeb1ca21ce 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/SortedTreeNodeCollectionTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
  * Testcase for class \TYPO3\CMS\Backend\Tree\SortedTreeNodeCollection.
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SortedTreeNodeCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
index 9fc2637df3350de0642aa08da8370c0a07fc98c8..566d926487add0922295e698caa860ffa85445c2 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeCollectionTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
  * Testcase for class \TYPO3\CMS\Backend\Tree\TreeNodeCollection.
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TreeNodeCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
index 48db1c2badb67594cfe441ff004b6accc4036d84..80e9b16c2cba6839711e2a23941a82fff02f93ff 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/TreeNodeTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Tree;
  * Testcase for class \TYPO3\CMS\Backend\Tree\TreeNode.
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class TreeNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
index 224828e8088ca12dfe2248adde84030a7e245546..cd277bebb876cfdceda22881729bb6d863f681e8 100644
--- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
@@ -28,8 +28,6 @@ use TYPO3\CMS\Backend\Utility;
 /**
  * Testcase for \TYPO3\CMS\Core\Utility\BackendUtility
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class BackendUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/IconUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/IconUtilityTest.php
index 7a9bc34a23fbc23cc9071129f3d388c79420dd4c..ae05abcac5236fb2f421554cca372e1909bd66f8 100644
--- a/typo3/sysext/backend/Tests/Unit/Utility/IconUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Utility/IconUtilityTest.php
@@ -31,8 +31,6 @@ use TYPO3\CMS\Backend\Utility\IconUtility;
  *
  * @author Fabien Udriot <fabien.udriot@ecodev.ch>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IconUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index f22cd54bbcdea2aef7476ea829ee34865a02e017..dcc0509cd87710f91b95766826df73619e4ad28a 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Controller;
  * Abstract class to show log entries from sys_log
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/belog/Classes/Controller/ToolsController.php b/typo3/sysext/belog/Classes/Controller/ToolsController.php
index fb1f3231ef0b17d2a2e16aaacc7e914bfcb96f9f..1a421bef2ceefb7e3a31500c7f3b70d2e9359f21 100644
--- a/typo3/sysext/belog/Classes/Controller/ToolsController.php
+++ b/typo3/sysext/belog/Classes/Controller/ToolsController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Controller;
  * Show log entries from table sys_log
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class ToolsController extends \TYPO3\CMS\Belog\Controller\AbstractController {
 
diff --git a/typo3/sysext/belog/Classes/Controller/WebInfoController.php b/typo3/sysext/belog/Classes/Controller/WebInfoController.php
index a304505c9081fdf20cd9d3cad1c420f12397c9e7..80cc9bd759a7c41aa911d6d66df30f30af7e0a8b 100644
--- a/typo3/sysext/belog/Classes/Controller/WebInfoController.php
+++ b/typo3/sysext/belog/Classes/Controller/WebInfoController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Controller;
  * Controller for log entry listings in Web->Info module
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class WebInfoController extends \TYPO3\CMS\Belog\Controller\AbstractController {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index 6e38e9aaeb630cb41a8f67f59000012824d393b2..a6225a1163ff04bc9d3057f4790add2959505032 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Domain\Model;
  * Constraints for log entries
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php b/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
index 3ed5585923261cf6da926a12700647dd0bd08bf8..3d0506f833c23a96c3f1c9fc5655a6f0d860726c 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/HistoryEntry.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Domain\Model;
  * Stub model for sys history - only properties required for belog module are added currently
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class HistoryEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index b6ffb867cf95013a79dafefb65e7a13cfd3c77a1..2aa7251a27e7b5e9d86fcd70b53926a365d149ad 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Belog\Domain\Model;
  *
  * @TODO : This should be stuffed to some more central place
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
index 0bea30845cf408583e0e3cc43682f94495ecec12..e26f7e0fc4c6d88630ae2cc45bb97f362d36330f 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Belog\Domain\Model;
  *
  * @TODO : This should be extended and put at some more central place
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class Workspace extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
index 25330512d365dd537951483ff40e886ed744189f..10846b4b1e2249033ac10fbe6b6f4c48e41c8b4d 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/HistoryEntryRepository.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Belog\Domain\Repository;
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class HistoryEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
index e5774237a738dfbdb202579f3ea354d034c15467..fd9f4d3f0bd1e65519d41f4e527aa231b1bb2de5 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\Domain\Repository;
  * Sys log entry repository
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class LogEntryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
index f07a54d3cca0efaf6bde751069b2ff9c0b37ce10..577d9b94565cf16838395e318f83948a378a4bb1 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/WorkspaceRepository.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Belog\Domain\Repository;
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class WorkspaceRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
index a3831bcfd6973a17e4a9baea3f72cb38b95dc5f3..cc6f3ed3eacded004c14dd124de74898c9adac71 100644
--- a/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
+++ b/typo3/sysext/belog/Classes/Module/BackendLogModuleBootstrap.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Belog\Module;
  * therefore we need to bootstrap extbase on our own here to jump to the WebInfo controller.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class BackendLogModuleBootstrap {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Be/AddJsFileViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Be/AddJsFileViewHelper.php
index 999817916e75ce549eeb1a671c28ac58baa329d6..e9d0ba746ccb92c66ec88ad27828df15609b8cda 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Be/AddJsFileViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Be/AddJsFileViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Be;
  * View helper to add a additional javascript file to the backend header
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class AddJsFileViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Be/InlineSettingsArrayViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Be/InlineSettingsArrayViewHelper.php
index c893906ab171c755e5c97fd500f9fe9e6eea1660..05bed751677c034922922816274374d389f43ebd 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Be/InlineSettingsArrayViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Be/InlineSettingsArrayViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Be;
  * View helper to add a additional javascript settings to the backend header
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class InlineSettingsArrayViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
index 5624a3f771a1fada8daeff9e52ef1f54b246ce6d..be25e4466cf8e1262f043236b37140258ba00434 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Be;
  * Get page path string from page id
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class PagePathViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
index c3e013d8a37e9fdda143bf69c2752012e41adfa7..715f378fc27a5c61e60b3068fc3fe86eb0ad799f 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Display error icon from error integer value
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class ErrorIconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
index 02f96c583bcc11fb549c2418f97ba7a88b652d71..fa6eaf21c71ab8da05f4f64af139cd5513cd03e9 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Form/TranslateLabelSelectViewHelper.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers\Form;
  * Will lookup number.200 (or whatever optionValue is given) in locallang database
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class TranslateLabelSelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
index fba14fbb602fe7d879332b0fe4d2e83184c69de7..46e8d34e098fdd7373023103fd145679cf38c238 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/FormatDetailsViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Create detail string from log entry
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class FormatDetailsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
index 9a2bbfac6800b87249e6779021e2779da8ff7b39..2cd8ccf43d2a9bd1cc27398bb8224d57beed9ed0 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Get history entry from for log entry
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class HistoryEntryViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
index 3e2ae2f9a58be3352ed656aa36b4b722985c46db..3e7339d89617d57bbd789f4ea6102d84e49bf253 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Returns true, if a specific extension is loaded
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class IsExtensionLoadedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
index 4986e9f33ae32743972eb7735d90deb9300e1640..8a62dca592b1aa6d2d16b285e2fa512b326fc5d0 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Get username from backend user id
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class UsernameViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
index 327e1f717e0bff9138119ba58a37acc5a0d177be..a1b5eeb078c561a0888e05d942d6d5e974913284 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Belog\ViewHelpers;
  * Get workspace title from workspace id
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage belog
  */
 class WorkspaceTitleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
index c9010d0558ceb3f3d4bdd8da79205c32df06d878..763c8d022d99c3f2d0db85bde72a79f996c71482 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Model;
  * Testcase
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class LogEntryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
index a28a6de00260dec227d6aa02f6f50b34d7974192..35f5baf62975d125bec4ef39bcf854830a6a0bb4 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
  * Testcase
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class HistoryEntryRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
index 12a51fa028151e0bec08b55fafcffd19ba848994..ca6c1f877e48c0ff019b4c773e8a8888b8685138 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
  * Testcase
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class LogEntryRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
index de2153378cd13a93dbd4a906c050a540394e018a..dd0754268f99873d62e9c5e109d3508fd34d8522 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Belog\Tests\Unit\Domain\Repository;
  * Testcase
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage belog
  */
 class WorkspaceRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
index 85258fc1ef5e160e12940c725b4cee792526d36f..776dd3af7a61c15ba9b301ce1aab732b2a51051c 100755
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Controller;
  * Backend module user administration controller
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
index 5758e9e790c54adc7b898ebdfa0bf433b4d8cc22..f36e653fd1821ad8abaf152d4e3bd00d91b38f19 100755
--- a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Model;
  * Model for backend user
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
index 7aa5362befd59c22e7e04c3d0a1d1c8337b0c742..cfb58ad27d836309c51dcc66ba2422f621c7c390 100755
--- a/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/BackendUserGroup.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Model;
  * Model for backend user group
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index c3b00b86260797571862def20c4a4c3b82ccb513..611d19f8a7c9e00368a5b6eab806246ea68e4bee 100755
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Model;
  * Demand filter for listings
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
index 2f3255da2dbf92e6a4ec34f2f981ea0db8d91dae..ac4288787f58027bcfd6778fd70c7ca5c897c0ca 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Beuser\Domain\Model;
  *
  * @author Felix Kopp <felix-source@phorax.com>
  * @author Nikolas Hagelstein <nikolas.hagelstein@gmail.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class ModuleData {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
index 947fe118736173e9a1f68cf035aa73a449b0f44a..0fd3c63ed25c44e0c4d43e76b47e7ae606e94fe9 100755
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserGroupRepository.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Repository;
  * Repository for \TYPO3\CMS\Beuser\Domain\Model\BackendUserGroup
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserGroupRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php
index b74eadea6e7f1d397b2a3a9f5080f1346d2a6b40..4889d906d5396b165195554225d58c3a4ffb1060 100755
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserRepository.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Repository;
  * Repository for Tx_Beuser_Domain_Model_BackendUser
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserRepository extends \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository {
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
index d869c0f8c56b0b218dbc4fe54b13a93cafaf4322..e846ed4dc7c727b272cc097457f541a71fbc0f48 100755
--- a/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
+++ b/typo3/sysext/beuser/Classes/Domain/Repository/BackendUserSessionRepository.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Domain\Repository;
  * Repository for Tx_Beuser_Domain_Model_BackendUser
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserSessionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
index 72650b4400ebf40783c6ccb285d2f92b30b95b9d..74a5c266a80698a4731a19237a911bbd04ad83ec 100644
--- a/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
+++ b/typo3/sysext/beuser/Classes/Service/ModuleDataStorageService.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Beuser\Service;
  *
  * @author Felix Kopp <felix-source@phorax.com>
  * @author Nikolas Hagelstein <nikolas.hagelstein@gmail.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class ModuleDataStorageService implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
index 9dc85183f11504f1be70a83b653efa177599ee1f..0021110707eb3d496c8f1a7d34711e7ecbf20b53 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/PagesViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
  * Converts comma separated list of pages uids to html unordered list (<ul>) with speaking titles
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class PagesViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
index c33dc4f7babb230ef711a2b8f79e3ae1e4add859..34fc49794a0f8c5e0f5af8a45c2989c09878c25b 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysFileMountsViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
  * Converts comma separated list of sys_filemounts uids to html unordered list (<ul>) with speaking titles
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SysFileMountsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
index 9fac587ac289239f919abbe2194f8fc0a58a6dbb..629f242f5c5e622614d8411d4876fd60bab20f1b 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Display/SysLanguageViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Display;
  * Converts comma separated list of sys_language uids to html unordered list (<ul>) with speaking titles
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SysLanguageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/Form/SelectDefaultValueViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/Form/SelectDefaultValueViewHelper.php
index 56cdbcbd8d4c85793a172d9e0695d9fd5591a6d5..9dddcf6ee30ac31bbdcb5ee439081138cbc7a5cd 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/Form/SelectDefaultValueViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/Form/SelectDefaultValueViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers\Form;
  * Extends Tx_Fluid_ViewHelpers_Form_SelectViewHelper with empty default value in select input field
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SelectDefaultValueViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
index 961bd705a29b6489e9d778a64fc4e81ea36a35d7..8dd8ac401ba5dc1a6fa6b7e3cba348b7de877fd9 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/IssueCommandViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
  * Issue command ViewHelper, see TYPO3 Core Engine method issueCommand
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class IssueCommandViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SectionViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SectionViewHelper.php
index 2d2f2212199d17683a6db9f34a33dea64436a728..ca050136495ae31d1b3a080a699b7ca1b7291a9b 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SectionViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SectionViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
  * Displays a section in backend module template, similar to template::section()
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SectionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
index 7fd8553dfe8db971bbfa6082f548527e050a1cb6..5a41e5bd18ca0a96bb46c35bcfea8d65f24c56f3 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteIconForRecordViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
  * Views sprite icon for a record (object)
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SpriteIconForRecordViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteManagerIconViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteManagerIconViewHelper.php
index 11dcc509710e41fac255592c8448891c5f6818f8..3196632873ba0ade812a5e06c34092404147b204 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SpriteManagerIconViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SpriteManagerIconViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
  * Displays sprite icon identified by iconName key
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SpriteManagerIconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php b/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
index 056fe0ed0b7c5ae1f45fee6331c95f8130be4001..6ff9d48c514a9ce65eff6188413e6a0c33552d3e 100755
--- a/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
+++ b/typo3/sysext/beuser/Classes/ViewHelpers/SwitchUserViewHelper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\ViewHelpers;
  * Displays 'SwitchUser' link with sprite icon to change current backend user to target (non-admin) backendUser
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class SwitchUserViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
index 922044147b16221271007e809ba0a7b507f15384..e2d5d62b1fe4b484d644ff0012411cafaa5f0c67 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
  * Test case for class Tx_Beuser_Domain_Model_BackendUser
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
index af0093b1da76eac557a84133bee66b5c1d1ad522..7f0b5d1675523c2d2e0ede0d81e72ef5d0e22b70 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Model;
  * Test case for class Tx_Beuser_Domain_Model_Demand
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class DemandTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index e01519dbd5d4ba7571a6184aa116a94be0cec04f..a147cfbaa220d5102dd13673c2dcd30f479c02af 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
  * Testcase for the Tx_Beuser_Domain_Repository_BackendUserRepository class.
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
index 26ee66cc5f0e85d9976c87bf4a570e1f6873941d..26f9a5402bc19e2a6523b8ea5217101631c1a24b 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Domain\Repository;
  * Testcase for the Tx_Beuser_Domain_Repository_BackendUserSessionRepository class.
  *
  * @author Felix Kopp <felix-source@phorax.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class BackendUserSessionRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
index eb63a2097fc8206e25fca7fac8d3db88775a5867..b86c711986221f64f13e3e692c79f2a3a44b945e 100644
--- a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Beuser\Tests\Unit\Service;
  *
  * @author Felix Kopp <felix-source@phorax.com>
  * @author Nikolas Hagelstein <nikolas.hagelstein@gmail.com>
- * @package TYPO3
- * @subpackage beuser
  */
 class ModuleDataStorageServiceTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/cms/layout/db_layout.php b/typo3/sysext/cms/layout/db_layout.php
index 3ca7608b51ac42bbdbdd79f61e7680daad6d1ed3..2a11e5c77fd01c0e424c572acf6ea8e1a3f10589 100755
--- a/typo3/sysext/cms/layout/db_layout.php
+++ b/typo3/sysext/cms/layout/db_layout.php
@@ -48,8 +48,6 @@ $BE_USER->modAccess($MCONF, 1);
  * Local extension of position map class
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
diff --git a/typo3/sysext/cms/layout/db_new_content_el.php b/typo3/sysext/cms/layout/db_new_content_el.php
index f3780da83ec2777133193a255c411d2636534a00..2b9f03ee4b84d115a72ea43999770242578ae6fe 100644
--- a/typo3/sysext/cms/layout/db_new_content_el.php
+++ b/typo3/sysext/cms/layout/db_new_content_el.php
@@ -50,8 +50,6 @@ $LOCAL_LANG = \TYPO3\CMS\Core\Utility\GeneralUtility::array_merge_recursive_over
  * Local position map class
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 
diff --git a/typo3/sysext/cms/tslib/class.tslib_pagegen.php b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
index 0b2d2e9562e79d24449c38ce84a76e6f474ae788..1165a8fd22ec763d3b6d31049f69f0cd3b04f6b1 100644
--- a/typo3/sysext/cms/tslib/class.tslib_pagegen.php
+++ b/typo3/sysext/cms/tslib/class.tslib_pagegen.php
@@ -9,8 +9,6 @@ require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('fronte
  * Class for fetching record relations for the frontend.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  * @see tslib_cObj::RECORDS()
  */
 class FE_loadDBGroup extends \TYPO3\CMS\Core\Database\RelationHandler {
diff --git a/typo3/sysext/cms/tslib/index_ts.php b/typo3/sysext/cms/tslib/index_ts.php
index a530be7d6cbaf04753cd9c3858aa1879f7bc70a2..8d4a2874a72b9c7efa5751b68d330ec060ef4a79 100644
--- a/typo3/sysext/cms/tslib/index_ts.php
+++ b/typo3/sysext/cms/tslib/index_ts.php
@@ -33,8 +33,6 @@
  * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 // Constants defined
 define('TYPO3_MODE', 'FE');
diff --git a/typo3/sysext/cms/tslib/pagegen.php b/typo3/sysext/cms/tslib/pagegen.php
index 98bc8bc7721b4b7dafd35d7bc033ebf345baa41d..95fc9262dd0431ae872db61f2c3a3f82cfa102bf 100644
--- a/typo3/sysext/cms/tslib/pagegen.php
+++ b/typo3/sysext/cms/tslib/pagegen.php
@@ -30,8 +30,6 @@
  * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 if (!is_object($TSFE)) {
 	die('You cannot execute this file directly. It\'s meant to be included from index_ts.php');
diff --git a/typo3/sysext/context_help/Classes/ExtDirect/ContextHelpDataProvider.php b/typo3/sysext/context_help/Classes/ExtDirect/ContextHelpDataProvider.php
index 241e6bc90b524d57c08982fd65e5bf4829e0d4a0..ad5a7ef10a934966e078fd49d3ab5c93c90cc59a 100644
--- a/typo3/sysext/context_help/Classes/ExtDirect/ContextHelpDataProvider.php
+++ b/typo3/sysext/context_help/Classes/ExtDirect/ContextHelpDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\ContextHelp\ExtDirect;
  * ExtDirect DataProvider for ContextHelp
  *
  * @author Steffen Kamper <steffen@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ContextHelpDataProvider {
 
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index 5496ad5e47208ef2434710c1e6784a353be9c9e8..5d13ce45b1ed0271b10d61046f2123ccb84dc366 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -12,8 +12,6 @@ namespace TYPO3\CMS\Core\Authentication;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractUserAuthentication {
 
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 2bfe68a9d441b12700dabc09d7c953b546d52d2f..1f85ced66f6ece568ffa45b24c18c86dd1792979 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Core\Authentication;
  * functions for the authentication process of backend users.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @internal
  */
 class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
index 3609b62053fb163e08d1124d05c97d33d4dbf282..36e9a1125c98bd752a6b1ff2d860f3b3419bb2e6 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  * @author Robert Lemke <robert@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendInterface {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
index 03f7147c84ef4921874350cbc07a23cd0b02739d..39324f87cb98bf2d9b4af15e53c062c2f271180c 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
@@ -45,8 +45,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @author Christian Jul Jensen <julle@typo3.org>
diff --git a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
index bd388d6626b168bae5999a59f10de2a607f45052..98c01dd95ccbde0c0c6eac21a7de5d01baf213d6 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  * A contract for a Cache Backend
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  * @api
  */
 interface BackendInterface
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 3533cc56fdb65cc77a889cef06480095624dc072..23031f758363ee05103068d359ec1606ee8f3ba2 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Karsten Dambekalns <karsten@typo3.org>
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index e8802a0a75be92bd5eabac51383cf37b2751823b..a81467b1a6fd5fbc1154b7c2aba1b30971c10cae 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -48,8 +48,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * This file is a backport from FLOW3 by Ingo Renner.
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Christian Jul Jensen <julle@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
diff --git a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
index 587827059c3f7890496b1ba9743e265b1e6ad472..a1705f6af012316666afd15bdeca3a2b109bd511 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
index db26658874bb8d1c3a92b237d3680ba44bfcd1a5..37e1385ad5ebf921def7e001201f3d756dd96f9e 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
 /**
  * A PDO database cache backend
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index da75d3a4b73944bac5d0d467a0cf96d4d20ea482..c01b508e3add4b657d43d3c2dd159104fd9230f7 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * @see http://code.google.com/p/redis/
  * @see http://github.com/owlient/phpredis
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Christopher Hlubek <hlubek@networkteam.com>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
index 58dc2b37ccd519b3ebfa37826b94b74063128767..6c7cb674ce4224b3cc51c68dd7f46cd14c50c039 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
@@ -14,8 +14,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  * A caching backend which stores cache entries in files, but does not support or
  * care about expiry times and tags.
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
index 2bb2417120b6fbfc51ce9a1e9c8fbb7ecbec759b..3fc25dd1e08be6ac3e389df9648468a190baea56 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @api
  */
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index bb6fd5b17a41e1c1da091588ee08d320ff784c35..66070ba1446c206460434fa3b58af9b1bbbaff1a 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
 /**
  * A caching backend which stores cache entries in database tables
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Ingo Renner <ingo@typo3.org>
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
index e4eddb6fde562c8b9a8fc969aed54659541011be..474f079c3e8b111e24c49bca65adf9a66337d5ff 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
@@ -44,8 +44,6 @@ namespace TYPO3\CMS\Core\Cache\Backend;
  * conflict.
  *
  * @author Tobias Burger <tobias_burger@hotmail.com>
- * @package TYPO3
- * @subpackage t3lib_cache
  */
 class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface {
 
diff --git a/typo3/sysext/core/Classes/Cache/Cache.php b/typo3/sysext/core/Classes/Cache/Cache.php
index fcff780b7bf3c92a76ca4b89b503bc1b00f3092f..2207700161e6da260fb631cb15a9073a71a210ee 100644
--- a/typo3/sysext/core/Classes/Cache/Cache.php
+++ b/typo3/sysext/core/Classes/Cache/Cache.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Cache;
  * A cache handling helper class
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Cache {
 
diff --git a/typo3/sysext/core/Classes/Cache/CacheFactory.php b/typo3/sysext/core/Classes/Cache/CacheFactory.php
index cabe7b2010b0788f3e553f74bd553e0f761aac3b..9a8fe1c3980e8b9acb4fce1c832990f601aef2c0 100644
--- a/typo3/sysext/core/Classes/Cache/CacheFactory.php
+++ b/typo3/sysext/core/Classes/Cache/CacheFactory.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Cache;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @scope singleton
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/CacheManager.php b/typo3/sysext/core/Classes/Cache/CacheManager.php
index 3652dca2d03590165f5503895762a0dda29f0eca..64b0918a23b52a440551c0301b64e2645ef1d823 100644
--- a/typo3/sysext/core/Classes/Cache/CacheManager.php
+++ b/typo3/sysext/core/Classes/Cache/CacheManager.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @scope singleton
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Exception.php b/typo3/sysext/core/Classes/Cache/Exception.php
index 4eb56ba3c343e1a7e33aa3c00c8fbc44b963cf0a..a7b2b9e139a92792b402bfe7b1775c7530679aaf 100644
--- a/typo3/sysext/core/Classes/Cache/Exception.php
+++ b/typo3/sysext/core/Classes/Cache/Exception.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class Exception extends \Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/ClassAlreadyLoadedException.php b/typo3/sysext/core/Classes/Cache/Exception/ClassAlreadyLoadedException.php
index 53870df3d3d32a96af0f6f8fb741e4d925df3bbe..94066ac4b61235664ab61190b05c32cddaadd4b3 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/ClassAlreadyLoadedException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/ClassAlreadyLoadedException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class ClassAlreadyLoadedException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/DuplicateIdentifierException.php b/typo3/sysext/core/Classes/Cache/Exception/DuplicateIdentifierException.php
index 746dca48d0aa82c18ace006dd6de70db1a57f635..03996098e03e313b04185d831ee509d91531516a 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/DuplicateIdentifierException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/DuplicateIdentifierException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class DuplicateIdentifierException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/InvalidBackendException.php b/typo3/sysext/core/Classes/Cache/Exception/InvalidBackendException.php
index 95db7d067fd22ed92041bb38ebddb3c3407f6f1d..aa741fdb8e1508e12d7244c9ece7a2d1689e5794 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/InvalidBackendException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/InvalidBackendException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class InvalidBackendException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/InvalidCacheException.php b/typo3/sysext/core/Classes/Cache/Exception/InvalidCacheException.php
index 5df74a7fa2242272f5364107813adfccc3328b16..cb02047543f6074332990e948bed6c51402a1130 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/InvalidCacheException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/InvalidCacheException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class InvalidCacheException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/InvalidDataException.php b/typo3/sysext/core/Classes/Cache/Exception/InvalidDataException.php
index 6de48ec5583ded3475a5cd08931bd703fed64682..3c35945a7ca0350a422cd61c53260ca72fb6091a 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/InvalidDataException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/InvalidDataException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class InvalidDataException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Exception/NoSuchCacheException.php b/typo3/sysext/core/Classes/Cache/Exception/NoSuchCacheException.php
index 76d3dc86751b7a5c40357f73206ad10383e9111b..848015b52b89abd86af91b055562a32a462f315f 100644
--- a/typo3/sysext/core/Classes/Cache/Exception/NoSuchCacheException.php
+++ b/typo3/sysext/core/Classes/Cache/Exception/NoSuchCacheException.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Exception;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 class NoSuchCacheException extends \TYPO3\CMS\Core\Cache\Exception {
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
index 8e365e802d709f46bbf2e28e410ebecb96286b37..d8756d0794b4dfb05861c70b7df53b433e829723 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @api
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
index eef765da7dbdd6b8e0e23808157c57643efcab6d..bc7c774ae74020e337d7bb7e35080d1fcb494c1f 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Cache\Frontend;
  * Contract for a Cache (frontend)
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib_cache
  * @api
  */
 interface FrontendInterface
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
index 69ce908691030db1b2a54f918987647ab089fdf4..6666a518e6a413100fbda760e013e1dc5a1b2dc5 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @api
  */
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
index 35051fac74c04be721e373530a37aa8d56086c55..8fdd21fffdc373a62d3c16667db38b4a9d36e5d7 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @api
  */
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
index 2082c48218b2b9b1263449721193429536af0b70..69528051f4bb624ee6eb22f1e293467556dfc222 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Cache\Frontend;
  *
  * This file is a backport from FLOW3
  *
- * @package TYPO3
- * @subpackage t3lib_cache
  * @author Robert Lemke <robert@typo3.org>
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @api
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index f9f1c213b77860d09848e56c8b02acc0bd993f9b..5d30bf8934c91414424edd2908e7c29209d60d70 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Category;
  *
  * @author Fabien Udriot <fabien.udriot@typo3.org>
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class CategoryRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
index ce992a065b9627d3fa46b4d1dc4e64c7675b1fd3..60f44d2e7d38a40cf090fc0d036242dc1b078090 100644
--- a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Category\Collection;
  * Category Collection to handle records attached to a category
  *
  * @author Fabien Udriot <fabien.udriot@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class CategoryCollection extends \TYPO3\CMS\Core\Collection\AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\EditableCollectionInterface {
 
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index a42f9e42d32245e83942102c4246f42ce85fb5c0..a260b9f831961ea0a45b4368b7ee5ea0b46314b0 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -62,8 +62,6 @@ namespace TYPO3\CMS\Core\Charset;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Martin Kutschker <martin.t.kutschker@blackbox.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class CharsetConverter {
 
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index b089acb59faaa33543f45b01f2fa72eff86a179f..fe0e515686fa644fa89319f2e6fa612d0ce8fc45 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Core\Collection;
  * The AbstractRecordCollection uses SplDoublyLinkedList for internal storage
  *
  * @author Steffen Ritter <typo3@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\RecordCollectionInterface, \TYPO3\CMS\Core\Collection\PersistableCollectionInterface, \TYPO3\CMS\Core\Collection\SortableCollectionInterface {
 
diff --git a/typo3/sysext/core/Classes/Collection/CollectionInterface.php b/typo3/sysext/core/Classes/Collection/CollectionInterface.php
index 21a3b2e6f0050dc206b79f63558a02bc72b6803f..d224ed5ff1a3618e478bdb23dbcc49dacc4adde8 100644
--- a/typo3/sysext/core/Classes/Collection/CollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/CollectionInterface.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Collection;
  * in an appropriate way itself
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface CollectionInterface extends \Iterator, \Serializable, \Countable
 {
diff --git a/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
index 264e5958cca0d9fb0ebca786cb7086f7be088675..e6b62d789e011fe525d4547c8cb677c80af3b7ec 100644
--- a/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/EditableCollectionInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Collection;
  * Interface for collection classes which es enabled to be modified
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface EditableCollectionInterface
 {
diff --git a/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
index 31503df9cd288395813690f290a4d205cec92908..9f07446b310bd29a60b616afb025d86cf131c225 100644
--- a/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/NameableCollectionInterface.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Collection;
  * being display by the same logic.
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface NameableCollectionInterface
 {
diff --git a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
index cc20caab1be0a3a896be9a5be9835b198c1d983e..3ec7260d3bc97b8e5dfbea726a24731a2e72eade 100644
--- a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Collection;
  * in an appropriate way itself
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PersistableCollectionInterface
 {
diff --git a/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php b/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
index 982a00f80e79831292ea0485909fda5da31e0806..ffef11071c4bc825fbb0490f99737ca4e62718bc 100644
--- a/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/RecordCollectionInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Collection;
  * Collection for handling records from a single database-table.
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface RecordCollectionInterface extends \TYPO3\CMS\Core\Collection\CollectionInterface, \TYPO3\CMS\Core\Collection\NameableCollectionInterface
 {
diff --git a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
index 5a88d0a1e59c63fb90720baa6a62e699b36799e0..99081c3e34db2d14847b920fcc2c1e8c4b0fea01 100644
--- a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
+++ b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Collection;
  * Implements the repository for record collections.
  *
  * @author Steffen Ritter <typo3@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RecordCollectionRepository {
 
diff --git a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
index f981fa50c07586445f40ad769fc691a2a06d6967..179b481586f560603bfdc5abc9cf3d4c96fa453f 100644
--- a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Core\Collection;
  * This assumes that entries are sortable and therefore a index can be assigned
  *
  * @author Steffen Ritter <typo3steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface SortableCollectionInterface
 {
diff --git a/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php b/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
index 9d8a166f56cbaf9243d10170ea0b345ef1775365..0c737045901fe66d7b5673efc8377ac7cbdddf04 100644
--- a/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/StaticRecordCollection.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Collection;
  * Implementation of a RecordCollection for static TCA-Records
  *
  * @author Steffen Ritter <typo3@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib
  */
 class StaticRecordCollection extends \TYPO3\CMS\Core\Collection\AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\EditableCollectionInterface {
 
diff --git a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
index 36d84b9e004d06f58fd39a5b7f7e63fde9902675..1dd14c384c7972f3765b6e288ad4633c7fed08d6 100644
--- a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
@@ -34,8 +34,6 @@ use TYPO3\CMS\Core\Utility;
  * - typo3conf/AdditionalConfiguration.php (optional additional local code blocks)
  * - typo3conf/localconf.php (legacy configuration file)
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Helge Funk <helge.funk@e-net.info>
  */
 class ConfigurationManager implements \TYPO3\CMS\Core\SingletonInterface {
diff --git a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
index 85141e10d44c1ba5d4a1d51fdbd77f5c2bc33f01..ee7e56f02cdf572339285727da18fc1ad6241a70 100644
--- a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
+++ b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Configuration\FlexForm;
  * Contains functions for manipulating flex form data
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FlexFormTools {
 
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 4abefcc933cc69b7c5f112c5cf68b40801d3ece1..4c9f470271900898148cae6d45b9028a86ab9aa3 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching;
  * Matches browserinfo, IPnumbers for use with templates
  *
  * @author Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractConditionMatcher {
 
diff --git a/typo3/sysext/core/Classes/Controller/CommandLineController.php b/typo3/sysext/core/Classes/Controller/CommandLineController.php
index f929f385badcc463eacfe3db81cbc080aa084892..511fcaf5f004b5202b6678c805e236c41eadf096 100644
--- a/typo3/sysext/core/Classes/Controller/CommandLineController.php
+++ b/typo3/sysext/core/Classes/Controller/CommandLineController.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Controller;
  * TYPO3 cli script basis
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class CommandLineController {
 
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index e06eb323cf13a94795ec8aacdd92a601c04baaf5..abe2528912b4ee2a0f09551ad097ead37c620798 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -15,8 +15,6 @@ require 'SystemEnvironmentBuilder.php';
  * exactly what you are doing!
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage core
  */
 class Bootstrap {
 
diff --git a/typo3/sysext/core/Classes/Core/CliBootstrap.php b/typo3/sysext/core/Classes/Core/CliBootstrap.php
index af9d7004a62f59ed3bcac896776d3690957517a4..b6a2303a80c1a55954901308f6568d4485ebd584 100644
--- a/typo3/sysext/core/Classes/Core/CliBootstrap.php
+++ b/typo3/sysext/core/Classes/Core/CliBootstrap.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Core;
  * This class encapsulates cli specific bootstrap methods.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage core
  */
 class CliBootstrap {
 
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index ae07c0c01b60183743ef5b713ef957d52e75a4ec..a7ede19f759dc7ffee9d8edc55634f6cb144304e 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -43,8 +43,6 @@ namespace TYPO3\CMS\Core\DataHandling;
  * tce_db.php for further comments and SYNTAX! Also see document 'TYPO3 Core API' for details.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DataHandler {
 
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
index 22e92cd123811765897ac2c9881bb7a9c6ff769f..d2dc7b56cfbc48d9eb88a60f8be5e3c359b4de24 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerCheckModifyAccessListHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\DataHandling;
  * Interface for hook in t3lib_TCEmain::checkModifyAccessList
  *
  * @author Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface DataHandlerCheckModifyAccessListHookInterface
 {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
index c48f40ee0bcd3f6eb37cce57f325b13c5239c5a1..35559cbd00c726c40719632270e11abd8385a23a 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandlerProcessUploadHookInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\DataHandling;
  * after the upload of a file.
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface DataHandlerProcessUploadHookInterface
 {
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 19b327485ba74931519698ac9b93daaf908958e0..19c011d459c9e4665924d8eed4010cb4bcebd753 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -52,8 +52,6 @@ namespace TYPO3\CMS\Core\Database;
  * Eg. $GLOBALS['TYPO3_DB']->sql_fetch_assoc()
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DatabaseConnection {
 
diff --git a/typo3/sysext/core/Classes/Database/PdoHelper.php b/typo3/sysext/core/Classes/Database/PdoHelper.php
index 46758391930815f2ba5642b3688e0dc0b2c84db9..9bbb02c5dee44a2e1d1c3d3b22a4e0ee9e757750 100644
--- a/typo3/sysext/core/Classes/Database/PdoHelper.php
+++ b/typo3/sysext/core/Classes/Database/PdoHelper.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Database;
  * Backport of FLOW3 class PdoHelper, last synced version: 3528
  *
  * @author Karsten Dambekalns <karsten@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PdoHelper {
 
diff --git a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
index f796e371f7ac3260f372090b1e4e2e5312175821..e5f325d482eee41b5a7c23efe0b82d445d1f02e2 100644
--- a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Database;
  * after a query has been executed.
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PostProcessQueryHookInterface
 {
diff --git a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
index 614285f3e1027bb31ca5988f5416d21613964290..f7d98ea53eeb394488c58710e06d6b14fdfd5d39 100644
--- a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Database;
  * before a query has been executed.
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PreProcessQueryHookInterface
 {
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index 5e31fc781cdecfc473e1bbe3eda2f3a92de48581..5bbfdc7732b5e0d2f259b3ed87b8d26cb4895f52 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Core\Database;
  * </code>
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PreparedStatement {
 
diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
index 8786314c08e7d28421adb3d048c60bd6402a595b..6a4e8c16242e13a4d719236f20c79fb8642f1e7c 100644
--- a/typo3/sysext/core/Classes/Database/QueryGenerator.php
+++ b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Database;
  *
  * @author Christian Jul Jensen <christian@typo3.com>
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class QueryGenerator {
 
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 5329708276cdff4907894a42677d48f52fe0c4f6..08b200f450c966834e1a6c2176b4599167261ee9 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Database;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Jo Hasenau <info@cybercraft.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class QueryView {
 
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 3608887956f32c7af73b14578e85b0c5bd596705..5b3e16eeae5c620343ae458f59869dc5c0c5a873 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Core\Database;
  * Anyway, I just wanted to document this finding - I don't think we can find a solution for it. And its very TemplaVoila specific.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ReferenceIndex {
 
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 4e49e95ee2860b8f83720a507bb49609de801053..0ded8a3b0f459966ef7fd73a32d83287029a4670 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Database;
  * Used to process the relations created by the TCA element types "group" and "select" for database records. Manages MM-relations as well.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RelationHandler {
 
diff --git a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
index 63a56535ebb508b117caa510ace0583639aaa5d4..72dfc297b31f51764086be98fe6f07f0e17af15b 100644
--- a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
@@ -76,8 +76,6 @@ namespace TYPO3\CMS\Core\Database;
  * - 'url' : URL highlights (with a scheme)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SoftReferenceIndex {
 
diff --git a/typo3/sysext/core/Classes/Database/SqlParser.php b/typo3/sysext/core/Classes/Database/SqlParser.php
index 9f7d4132b7454e30c2a313980a49d5a17908fbb4..1318f73e8502d8242bee0e10bfda8d9657f1533f 100644
--- a/typo3/sysext/core/Classes/Database/SqlParser.php
+++ b/typo3/sysext/core/Classes/Database/SqlParser.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Core\Database;
  * TYPO3 SQL parser class.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SqlParser {
 
diff --git a/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php b/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
index af28a9bd40a1b2b941aff953350ccf85267bac6b..a5b124ea18b5ab972b0de3fc06a91b5f9e53bc20 100644
--- a/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/TableConfigurationPostProcessingHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Database;
  * interface for classes with hook for postprocessing extTables after loading
  *
  * @author Steffen Ritter <steffen.ritter@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface TableConfigurationPostProcessingHookInterface
 {
diff --git a/typo3/sysext/core/Classes/ElementBrowser/ElementBrowserHookInterface.php b/typo3/sysext/core/Classes/ElementBrowser/ElementBrowserHookInterface.php
index 3cd1fc9c0f2d7dcb0c30739ad70e83dd9d8182d3..3a7491bf7caa252a676f211a9513b2e1a17c4f7f 100644
--- a/typo3/sysext/core/Classes/ElementBrowser/ElementBrowserHookInterface.php
+++ b/typo3/sysext/core/Classes/ElementBrowser/ElementBrowserHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\ElementBrowser;
  * Interface for classes which hook into browse_links
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ElementBrowserHookInterface
 {
diff --git a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
index ee5b7dd3c05f5379ae295d51e55ee67ac265f1b3..17fecfbfeafc963257e1c94383592d6a3dde4eac 100644
--- a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
+++ b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Encoder;
  * This class provides encoding for user input that is intended to be used in a JavaScript context.
  * It encodes all characters except alphanumericals and the immune characters to a hex representation.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Mike Boberski <boberski_michael@bah.com>
  * @author Franz G. Jahn <franzjahn@cron-it.de>
  * @author Helmut Hummel <helmut.hummel@typo3.org>
diff --git a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
index 99d717e6bea9185038d9c0c936e85a63e46a4787..ced176268a57442650ae813d39f4450a63b6eb26 100644
--- a/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/AbstractExceptionHandler.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 abstract class AbstractExceptionHandler implements \TYPO3\CMS\Core\Error\ExceptionHandlerInterface, \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php b/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
index 51c1c4d8b42b181b6771eea5617cbe8daf27ad32..45e8c8495f7e5031eaf59f696dac0242ab883f3f 100644
--- a/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/DebugExceptionHandler.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib_error
  */
 class DebugExceptionHandler extends \TYPO3\CMS\Core\Error\AbstractExceptionHandler {
 
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandler.php b/typo3/sysext/core/Classes/Error/ErrorHandler.php
index 8164d5daf40d7dac9853d9e95f8cf21832310ed5..55416ea863be275de8efcf7b541076b518b52ba1 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandler.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandler.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Rupert Germann <rupi@gmx.li>
- * @package TYPO3
- * @subpackage error
  */
 class ErrorHandler implements \TYPO3\CMS\Core\Error\ErrorHandlerInterface {
 
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php b/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
index e00f7774ec8d8377ea4e3405d3e06b1c93e0462d..c04e4e456ab5da255007d5716c7cbbf91b5cf516 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandlerInterface.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 interface ErrorHandlerInterface
 {
diff --git a/typo3/sysext/core/Classes/Error/Exception.php b/typo3/sysext/core/Classes/Error/Exception.php
index bdaa7060a810682ebdb49c8865bf257ebfc35c96..84488b6417276ce1eb8fcaa35a7b77677a977ab4 100644
--- a/typo3/sysext/core/Classes/Error/Exception.php
+++ b/typo3/sysext/core/Classes/Error/Exception.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class Exception extends \TYPO3\CMS\Core\Exception {
 
diff --git a/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php b/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
index afec8165a4446563c20119d71b3c7aae2bd29445..861ec9f7a9e9ff915f576cad97a04a028d64f7f2 100644
--- a/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
+++ b/typo3/sysext/core/Classes/Error/ExceptionHandlerInterface.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 interface ExceptionHandlerInterface
 {
diff --git a/typo3/sysext/core/Classes/Error/Http/AbstractClientErrorException.php b/typo3/sysext/core/Classes/Error/Http/AbstractClientErrorException.php
index 292103023db1e6dd4320c5510b9083649f3cdad9..d8eaddea9a057025b86ee12349b1e052ec6f7467 100644
--- a/typo3/sysext/core/Classes/Error/Http/AbstractClientErrorException.php
+++ b/typo3/sysext/core/Classes/Error/Http/AbstractClientErrorException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * HTTP Client Error Exception (Error 4xx)
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 abstract class AbstractClientErrorException extends \TYPO3\CMS\Core\Error\Http\StatusException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/AbstractServerErrorException.php b/typo3/sysext/core/Classes/Error/Http/AbstractServerErrorException.php
index 8f74697f00c9e1773fb23d7cd92964375406f431..be33d813837d864e6a2b52ffe9a3829f936294f1 100644
--- a/typo3/sysext/core/Classes/Error/Http/AbstractServerErrorException.php
+++ b/typo3/sysext/core/Classes/Error/Http/AbstractServerErrorException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * HTTP Server Error Exception (Error 5xx)
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 abstract class AbstractServerErrorException extends \TYPO3\CMS\Core\Error\Http\StatusException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/BadRequestException.php b/typo3/sysext/core/Classes/Error/Http/BadRequestException.php
index 0d9188ffe0c6d9c4bd074aed0c5e0c1ec0b79253..606eb7068a4d379dbda72c61152aaf72e59d50d1 100644
--- a/typo3/sysext/core/Classes/Error/Http/BadRequestException.php
+++ b/typo3/sysext/core/Classes/Error/Http/BadRequestException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * Exception for Error 400 - Bad Request
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class BadRequestException extends \TYPO3\CMS\Core\Error\Http\AbstractClientErrorException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/ForbiddenException.php b/typo3/sysext/core/Classes/Error/Http/ForbiddenException.php
index bcd92171bddd95e035bf26da250077e913a6aa08..fe3292307bf064c48deb3f84184a1333f0bd5269 100644
--- a/typo3/sysext/core/Classes/Error/Http/ForbiddenException.php
+++ b/typo3/sysext/core/Classes/Error/Http/ForbiddenException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * Exception for Error 403 - Forbidden
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class ForbiddenException extends \TYPO3\CMS\Core\Error\Http\AbstractClientErrorException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/PageNotFoundException.php b/typo3/sysext/core/Classes/Error/Http/PageNotFoundException.php
index a1cd98003559801e1b678c5c9e264095f4658bcb..ad726487058bff2fe7866bee1a66568d362aee33 100644
--- a/typo3/sysext/core/Classes/Error/Http/PageNotFoundException.php
+++ b/typo3/sysext/core/Classes/Error/Http/PageNotFoundException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * Exception for Error 404 - Page Not Found
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class PageNotFoundException extends \TYPO3\CMS\Core\Error\Http\AbstractClientErrorException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/ServiceUnavailableException.php b/typo3/sysext/core/Classes/Error/Http/ServiceUnavailableException.php
index 08886ccd83c01d5cd78a3adb614b2afb4cb47c64..c46cecbc8045a6efc8b920e8f0e3997722cda031 100644
--- a/typo3/sysext/core/Classes/Error/Http/ServiceUnavailableException.php
+++ b/typo3/sysext/core/Classes/Error/Http/ServiceUnavailableException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * Exception for Error 503 - Service Unavailable
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class ServiceUnavailableException extends \TYPO3\CMS\Core\Error\Http\AbstractServerErrorException {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/StatusException.php b/typo3/sysext/core/Classes/Error/Http/StatusException.php
index 7fb98fa2825d5287143b402ef492745d926b21b1..b3cf64b24341232fcb6bd531616435b03ebeac04 100644
--- a/typo3/sysext/core/Classes/Error/Http/StatusException.php
+++ b/typo3/sysext/core/Classes/Error/Http/StatusException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * HTTP Status Exception
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class StatusException extends \TYPO3\CMS\Core\Error\Exception {
 
diff --git a/typo3/sysext/core/Classes/Error/Http/UnauthorizedException.php b/typo3/sysext/core/Classes/Error/Http/UnauthorizedException.php
index 7d0dc34da881ad59e207a9f05f08cc2b8b659dcb..1765e4cd6fae03ec61de0d457284c6d9b664dcb0 100644
--- a/typo3/sysext/core/Classes/Error/Http/UnauthorizedException.php
+++ b/typo3/sysext/core/Classes/Error/Http/UnauthorizedException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Error\Http;
  * Exception for Error 401 - Unauthorized
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class UnauthorizedException extends \TYPO3\CMS\Core\Error\Http\AbstractClientErrorException {
 
diff --git a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
index 921a08350245e24398526f4ca4ead74cf3d83b13..9e8e8f8f5ae560b8ac873411058585f633de7af8 100644
--- a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Error;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage error
  */
 class ProductionExceptionHandler extends \TYPO3\CMS\Core\Error\AbstractExceptionHandler {
 
diff --git a/typo3/sysext/core/Classes/Exception.php b/typo3/sysext/core/Classes/Exception.php
index 540047c8ca9079d4968ad89b7beb53916cc66f1c..a5a0c347655a73208a81a2450bc785ca39b96234 100644
--- a/typo3/sysext/core/Classes/Exception.php
+++ b/typo3/sysext/core/Classes/Exception.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core;
 /**
  * An exception
  *
- * @package TYPO3
- * @subpackage t3lib_error
  */
 class Exception extends \Exception {
 
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
index 09358b75acbf770e20e4a6faf8c874ef9ca3fc89..a9562c9dfbef16fb9416b950dad71c4ca5cd9d1f 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\ExtDirect;
  *
  * @author Sebastian Kurfürst <sebastian@typo3.org>
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtDirectApi {
 
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
index bfd52f976b6b28963013c7ab88f5912a625d3410..8e59defb33d217f32a5e862add5aae729f153ffa 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectDebug.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\ExtDirect;
  * Ext Direct Debug
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtDirectDebug {
 
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectRouter.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectRouter.php
index 1b5e599b23f5af028db5981ecc1eea87ffc3244e..63b3880a3cbe178e93022fc8884ca374988124ee 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectRouter.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectRouter.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\ExtDirect;
  *
  * @author Sebastian Kurfürst <sebastian@typo3.org>
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtDirectRouter {
 
diff --git a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
index 4e689876fa0cf34f3caf881474a8af1668335cd0..ecaa4a5eff2314f9377d41bf95ceabff1f0114bd 100644
--- a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\FormProtection;
  * For documentation on how to use this class, please see the documentation of
  * the corresponding subclasses, e.g. t3lib_formprotection_BackendFormProtection.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
diff --git a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
index 9221af18be92eaf567b764e0770002b2e070b3af..fa349fbe27a4e1e3033e55098af0c5f76c277179 100644
--- a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
@@ -81,8 +81,6 @@ namespace TYPO3\CMS\Core\FormProtection;
 /**
  * Backend form protection
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
diff --git a/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php b/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
index 59c638f4425d3ab2d0f11fa044609b6c746f8d7c..9ebd475f45e1bb21e8a5ce22e40a12819e7b37db 100644
--- a/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/DisabledFormProtection.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\FormProtection;
  * This class is a dummy implementation of the form protection,
  * which is used when no authentication is used.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
 class DisabledFormProtection extends \TYPO3\CMS\Core\FormProtection\AbstractFormProtection {
diff --git a/typo3/sysext/core/Classes/FormProtection/Exception.php b/typo3/sysext/core/Classes/FormProtection/Exception.php
index 70b13277325abf101c3e3107543c251c8a1cb958..7c2cc389d2053929d02efb095b11cd79ce84bfea 100644
--- a/typo3/sysext/core/Classes/FormProtection/Exception.php
+++ b/typo3/sysext/core/Classes/FormProtection/Exception.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\FormProtection;
 /**
  * Invalid token exception
  *
- * @package TYPO3
- * @subpackage t3lib_formprotection
  * @api
  */
 class Exception extends \UnexpectedValueException {
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index e550e7dfdc84709379b1f92629447ed53ad02286..6ce5b6a493479611903fa89f6f22f40c2da9070a 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -44,8 +44,6 @@ namespace TYPO3\CMS\Core\FormProtection;
  * $formProtection->injectInstallTool($this);
  * </pre>
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Ernesto Baschny <ernst@cron-it.de>
  * @author Helmut Hummel <helmut.hummel@typo3.org>
diff --git a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
index 450005772d4b6e7c5837dc31b7f852389e26dd21..52e347b5b5c84291c174a69592a02bdd4294be3a 100644
--- a/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/InstallToolFormProtection.php
@@ -67,8 +67,6 @@ namespace TYPO3\CMS\Core\FormProtection;
 /**
  * Install Tool form protection
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class InstallToolFormProtection extends AbstractFormProtection {
diff --git a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
index a0388a962dff57196a63cee6559fc9b0ad070491..439a4677642bdf0c1eecf59adab1d334d2c21b64 100644
--- a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
+++ b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\FrontendEditing;
  *
  * @author Jeff Segars <jeff@webempoweredchurch.org>
  * @author David Slayback <dave@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FrontendEditingController {
 
diff --git a/typo3/sysext/core/Classes/Html/HtmlParser.php b/typo3/sysext/core/Classes/Html/HtmlParser.php
index 872100da02eba10adefec1eabf554f4c79902be6..517ed6dc423d60b15f78769fe3b4cde31afa4b88 100644
--- a/typo3/sysext/core/Classes/Html/HtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/HtmlParser.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Html;
  * You are encouraged to use this class in your own applications
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class HtmlParser {
 
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index 7e304da92e89fb2314898adfe67876ad4cdc21d1..04ca7752d7a3fe174165e3cea8ed0c39e461d5b2 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Html;
  * Class for parsing HTML for the Rich Text Editor. (also called transformations)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
 
diff --git a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
index 273084de03a61e8dd20ef20399a0c22f89220a72..5cab545ccae282e5cbf028af115c2dbcb779d160 100644
--- a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
+++ b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Http;
  * the right headers for the request type
  *
  * @author Benjamin Mack <mack@xnos.org>
- * @package TYPO3
- * @subpackage core
  */
 class AjaxRequestHandler {
 
diff --git a/typo3/sysext/core/Classes/Http/HttpRequest.php b/typo3/sysext/core/Classes/Http/HttpRequest.php
index 53f196cadbbb2fd634e0657261b7b075183c94d4..d5d845f0663a90f7c6156fb5e864abee057c0069 100644
--- a/typo3/sysext/core/Classes/Http/HttpRequest.php
+++ b/typo3/sysext/core/Classes/Http/HttpRequest.php
@@ -35,8 +35,6 @@ require_once('HTTP/Request2.php');
  * Extends \HTTP_Request2 and sets TYPO3 environment defaults
  *
  * @author Philipp Gampe <philipp.gampe@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class HttpRequest extends \HTTP_Request2 {
 
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index e35619e267dfd4e36b0a4a5add9036db96d090ce..427ae212be8103f4f8384e558506d086ecfec01f 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Core\Imaging;
  * $TYPO3_CONF_VARS['GFX']['gdlib_2'] = 0,	// String/Boolean. Set this if you are using the new GDlib 2.0.1+. If you don't set this flag and still use GDlib2, you might encounter strange behaviours like black images etc. This feature might take effect only if ImageMagick is installed and working as well! You can also use the value "no_imagecopyresized_fix" - in that case it will NOT try to fix a known issue where "imagecopyresized" does not work correctly.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see tslib_gifBuilder
  */
 class GraphicalFunctions {
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index 9e7760b661a70748e54feaa4dbd8de68a022d632..32fe298466e8512bfaac744aab7a81b7c935ac2d 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -43,8 +43,6 @@ namespace TYPO3\CMS\Core\Integrity;
  * @todo Need to really extend this class when the tcemain library has been updated and the whole API is better defined. There are some known bugs in this library. Further it would be nice with a facility to not only analyze but also clean up!
  * @see SC_mod_tools_dbint_index::func_relations(), SC_mod_tools_dbint_index::func_records()
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DatabaseIntegrityCheck {
 
diff --git a/typo3/sysext/core/Classes/Localization/Exception/FileNotFoundException.php b/typo3/sysext/core/Classes/Localization/Exception/FileNotFoundException.php
index 72be55827d3d92027b496e86701be89766114f61..de5b5f29fcacdbfba54369aa61ead04c819ecdcc 100644
--- a/typo3/sysext/core/Classes/Localization/Exception/FileNotFoundException.php
+++ b/typo3/sysext/core/Classes/Localization/Exception/FileNotFoundException.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Exception;
 /**
  * File not found exception
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class FileNotFoundException extends \RuntimeException {
diff --git a/typo3/sysext/core/Classes/Localization/Exception/InvalidParserException.php b/typo3/sysext/core/Classes/Localization/Exception/InvalidParserException.php
index 7bfae232551a04220c351dd1bb3a4c5b05592556..d411f74b14b263d585525e93a35bccec7c2ea04d 100644
--- a/typo3/sysext/core/Classes/Localization/Exception/InvalidParserException.php
+++ b/typo3/sysext/core/Classes/Localization/Exception/InvalidParserException.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Exception;
 /**
  * Invalid Parser exception
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class InvalidParserException extends \RuntimeException {
diff --git a/typo3/sysext/core/Classes/Localization/Exception/InvalidXmlFileException.php b/typo3/sysext/core/Classes/Localization/Exception/InvalidXmlFileException.php
index 6d32027169d683e77f1ea6298ff93da7b3f7805e..6fa72041cc9c13e1ec31e0b1433f6f59b4ccc79d 100644
--- a/typo3/sysext/core/Classes/Localization/Exception/InvalidXmlFileException.php
+++ b/typo3/sysext/core/Classes/Localization/Exception/InvalidXmlFileException.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Exception;
 /**
  * Invalid XML file exception
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class InvalidXmlFileException extends \RuntimeException {
diff --git a/typo3/sysext/core/Classes/Localization/LanguageStore.php b/typo3/sysext/core/Classes/Localization/LanguageStore.php
index 067345887b29b9feaabb5ff42ea4e8f61eb536fb..c0e30a1e11bf559c5596d16ec43276c21b286ce0 100644
--- a/typo3/sysext/core/Classes/Localization/LanguageStore.php
+++ b/typo3/sysext/core/Classes/Localization/LanguageStore.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization;
 /**
  * Language store.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dominique.feyer@reelpeek.net>
  */
 class LanguageStore implements \TYPO3\CMS\Core\SingletonInterface {
diff --git a/typo3/sysext/core/Classes/Localization/Locales.php b/typo3/sysext/core/Classes/Localization/Locales.php
index a6f28cb033fc281e75b8e428b5a6a065038e30f9..958724184b4fc201824a9712bb43f7d97a0ab5c5 100644
--- a/typo3/sysext/core/Classes/Localization/Locales.php
+++ b/typo3/sysext/core/Classes/Localization/Locales.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Localization;
  * - Update 'setup' extension labels (sysext/setup/mod/locallang.xlf)
  * That's it!
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Xavier Perseguers <typo3@perseguers.ch>
  */
 class Locales implements \TYPO3\CMS\Core\SingletonInterface {
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index 87849e5aaa1acceaa9d22b379066f143d255a547..84bbf2f970da7a02b1779840329e4e2b73ae6f7d 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization;
 /**
  * Provides a language parser factory.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface {
diff --git a/typo3/sysext/core/Classes/Localization/Parser/AbstractXmlParser.php b/typo3/sysext/core/Classes/Localization/Parser/AbstractXmlParser.php
index c25f153c01bbe60bc0fa129e5c80076c32ebfa66..2550d27d573dd8d04f55f66a806d22897518c43a 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/AbstractXmlParser.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/AbstractXmlParser.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Parser;
 /**
  * Abstract class for XML based parser.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 abstract class AbstractXmlParser implements \TYPO3\CMS\Core\Localization\Parser\LocalizationParserInterface {
diff --git a/typo3/sysext/core/Classes/Localization/Parser/LocalizationParserInterface.php b/typo3/sysext/core/Classes/Localization/Parser/LocalizationParserInterface.php
index 24816347ba66453c4dc2a32b2840fd6d152aaac8..969baba36efc5a54a7984188925eb75c6cc5a5db 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/LocalizationParserInterface.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/LocalizationParserInterface.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Parser;
 /**
  * Parser interface.
  *
- * @package 	TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 interface LocalizationParserInterface
diff --git a/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php b/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
index b5d28c30747d0c0403d9f4f1efb993b358df5f7c..277cae5e6cedc0b97a81a41364ae1603e956fc5c 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Parser;
 /**
  * Parser for PHP locallang array.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  * @author Dmitry Dulepov <dmitry.dulepov@gmail.com>
  */
diff --git a/typo3/sysext/core/Classes/Localization/Parser/LocallangXmlParser.php b/typo3/sysext/core/Classes/Localization/Parser/LocallangXmlParser.php
index 8ad875077e10c90ed373292061a637c48e58dc13..e1776004e3e29b9c07e1851076408e3008452b8c 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/LocallangXmlParser.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/LocallangXmlParser.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Parser;
 /**
  * Parser for XML locallang file.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class LocallangXmlParser extends \TYPO3\CMS\Core\Localization\Parser\AbstractXmlParser {
diff --git a/typo3/sysext/core/Classes/Localization/Parser/XliffParser.php b/typo3/sysext/core/Classes/Localization/Parser/XliffParser.php
index 564d2c39b523f025ab30698d7507c47108adcb8d..3dad2eaf8059b57f30224a9e72b235324c2e96f2 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/XliffParser.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/XliffParser.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Localization\Parser;
 /**
  * Parser for XLIFF file.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Dominique Feyer <dfeyer@reelpeek.net>
  */
 class XliffParser extends \TYPO3\CMS\Core\Localization\Parser\AbstractXmlParser {
diff --git a/typo3/sysext/core/Classes/Locking/Locker.php b/typo3/sysext/core/Classes/Locking/Locker.php
index 4110a2a5785ff8ede0e7248bba2b28ce1829861a..ae64a596c01f56644a0f8ba62b8acc368e148b99 100644
--- a/typo3/sysext/core/Classes/Locking/Locker.php
+++ b/typo3/sysext/core/Classes/Locking/Locker.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Core\Locking;
  * This is especially useful if two clients are requesting the same website short after each other. While the request of client 1 triggers building and caching of the website, client 2 will be waiting at this lock.
  *
  * @author Michael Stucki <michael@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  * @see 	class.t3lib_tstemplate.php, class.tslib_fe.php
  */
 class Locker {
diff --git a/typo3/sysext/core/Classes/Log/LogLevel.php b/typo3/sysext/core/Classes/Log/LogLevel.php
index 7d26c884b7f74daddbe068ea4cc25df6d22a6015..f91a854dfa1a8488eb658a94861b031dff6696db 100644
--- a/typo3/sysext/core/Classes/Log/LogLevel.php
+++ b/typo3/sysext/core/Classes/Log/LogLevel.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log;
  * Log levels according to RFC 3164
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LogLevel {
 
diff --git a/typo3/sysext/core/Classes/Log/LogManager.php b/typo3/sysext/core/Classes/Log/LogManager.php
index fcce41d877b06ae7e406f27480e3a04cde1ec186..c0a03695c1f29569e08baf1802b39f9101216c3c 100644
--- a/typo3/sysext/core/Classes/Log/LogManager.php
+++ b/typo3/sysext/core/Classes/Log/LogManager.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Log;
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LogManager implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Log/LogRecord.php b/typo3/sysext/core/Classes/Log/LogRecord.php
index 595c6559c2fed7d94c0a06cdf367103fd5883741..2329dde2ea25c17159707cdfd0e1120bbbb4ecea 100644
--- a/typo3/sysext/core/Classes/Log/LogRecord.php
+++ b/typo3/sysext/core/Classes/Log/LogRecord.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller (typo3@t3node.com)
- * @package TYPO3
- * @subpackage t3lib
  */
 class LogRecord implements \ArrayAccess {
 
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index ef8692c82cbcf518fc86f622e567b5e242a458c1..2ad94627e9f02e7f8812e10d9973ddb61308bd0a 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Log;
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Logger {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
index be0489f258ed9db2832aa6ab2017b7c9f4beeac2..398e155fcdf7af47d514d68958e9e8324498ed62 100644
--- a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/AbstractProcessor.php b/typo3/sysext/core/Classes/Log/Processor/AbstractProcessor.php
index d782f41b2fe221791b9a5acf824be3aff7290741..98d76abbf5546ff2b1106fe009fc41b631519cfa 100644
--- a/typo3/sysext/core/Classes/Log/Processor/AbstractProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/AbstractProcessor.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * Abstract implementation of a log processor
  *
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractProcessor implements \TYPO3\CMS\Core\Log\Processor\ProcessorInterface {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php b/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
index 2d642590ede60a1a12fe09220430d1a5a4311059..b1f387a0fe2b21abf1d20ce60bf1645626601ccf 100644
--- a/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * Introspection processor to automatically add where the log record came from.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IntrospectionProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/MemoryPeakUsageProcessor.php b/typo3/sysext/core/Classes/Log/Processor/MemoryPeakUsageProcessor.php
index 34a3f0766af1c0fb74f6e823530db3e24c8d73a9..909b0b657dd3e088429483a453f1be29d7ea882e 100644
--- a/typo3/sysext/core/Classes/Log/Processor/MemoryPeakUsageProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/MemoryPeakUsageProcessor.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MemoryPeakUsageProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractMemoryProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/MemoryUsageProcessor.php b/typo3/sysext/core/Classes/Log/Processor/MemoryUsageProcessor.php
index 55fce434af8095346d0a0eb27d487e148efec2b5..052447d7640963f2ed432bd003362ce5fd80d893 100644
--- a/typo3/sysext/core/Classes/Log/Processor/MemoryUsageProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/MemoryUsageProcessor.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MemoryUsageProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractMemoryProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/NullProcessor.php b/typo3/sysext/core/Classes/Log/Processor/NullProcessor.php
index 60a4addc0b415eac821a6eeea93dda5090f5e335..7195e7a26c8737ea9508bcf1520600ef3308e8d5 100644
--- a/typo3/sysext/core/Classes/Log/Processor/NullProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/NullProcessor.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * A log processor that does nothing. Used in unit tests.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class NullProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/ProcessorInterface.php b/typo3/sysext/core/Classes/Log/Processor/ProcessorInterface.php
index 82e24a3acec4c548d634e761fddd8a15ec78c1b4..930acce8abd5881d8e47873aa9039254410362d8 100644
--- a/typo3/sysext/core/Classes/Log/Processor/ProcessorInterface.php
+++ b/typo3/sysext/core/Classes/Log/Processor/ProcessorInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  * collect that data yourself.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ProcessorInterface
 {
diff --git a/typo3/sysext/core/Classes/Log/Processor/WebProcessor.php b/typo3/sysext/core/Classes/Log/Processor/WebProcessor.php
index 023e6549a6002048c128fb9e58df5cafe79eff13..97ad0f303628fbd9edfddad9d5197607c7f9ab10 100644
--- a/typo3/sysext/core/Classes/Log/Processor/WebProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/WebProcessor.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class WebProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProcessor {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/AbstractWriter.php b/typo3/sysext/core/Classes/Log/Writer/AbstractWriter.php
index ce4ee9d663b9a75a7348ea8a0d19a71ce3d0f7d7..073fe17e3d7ad3d953d14dad6a59afcddb691531 100644
--- a/typo3/sysext/core/Classes/Log/Writer/AbstractWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/AbstractWriter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * Abstract implementation of a log writer
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractWriter implements \TYPO3\CMS\Core\Log\Writer\WriterInterface {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/DatabaseWriter.php b/typo3/sysext/core/Classes/Log/Writer/DatabaseWriter.php
index ff300cc4f56a23fc90b2e8bef37d4bc7b1efd73c..47590757fef25ec653bb7d99dc1dcae1ff7d97ee 100644
--- a/typo3/sysext/core/Classes/Log/Writer/DatabaseWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/DatabaseWriter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * Log writer that writes the log records into a database table.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DatabaseWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
index 62feb32e8f05d9dea227aa8c33b0c22ec17a0d0e..792c1d42abfe8d72fd70453018cf1de760e9ae86 100644
--- a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/NullWriter.php b/typo3/sysext/core/Classes/Log/Writer/NullWriter.php
index 2be27762ad653933b712e7be96638d19a9ba7e66..0493cd0b50b95fa5b46c5bc78f0a3577af377217 100644
--- a/typo3/sysext/core/Classes/Log/Writer/NullWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/NullWriter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * Null writer - just forgets about everything
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class NullWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/PhpErrorLogWriter.php b/typo3/sysext/core/Classes/Log/Writer/PhpErrorLogWriter.php
index 2f73e3cc72aa2baa8c2e57a943269af127667932..c7749291e0d0ab653cf05dd6f9d67400dd9d0aa2 100644
--- a/typo3/sysext/core/Classes/Log/Writer/PhpErrorLogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/PhpErrorLogWriter.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PhpErrorLogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
index a600e8d130f08565cfcfc1a459ad7d72bbd4fdbb..d6f98bcdd3b9eec9d0cd5dd0ee9634821e4f89e0 100644
--- a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SyslogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/WriterInterface.php b/typo3/sysext/core/Classes/Log/Writer/WriterInterface.php
index c86dd75b5a3a70d7b8ab7a8d29bee12b6c8ddf93..c4e5c1174607a037c54fdb2ab9685ca20f0fecbf 100644
--- a/typo3/sysext/core/Classes/Log/Writer/WriterInterface.php
+++ b/typo3/sysext/core/Classes/Log/Writer/WriterInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Log\Writer;
  * Log writer interface
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface WriterInterface
 {
diff --git a/typo3/sysext/core/Classes/Mail/MailMessage.php b/typo3/sysext/core/Classes/Mail/MailMessage.php
index 7690f475260969dd4f4b2ebc77f200e042346fc7..e0812b29ca893da6ed799c52ca890281ca7c7f4c 100644
--- a/typo3/sysext/core/Classes/Mail/MailMessage.php
+++ b/typo3/sysext/core/Classes/Mail/MailMessage.php
@@ -8,8 +8,6 @@ require_once PATH_typo3 . 'contrib/swiftmailer/swift_required.php';
  * Adapter for Swift_Mailer to be used by TYPO3 extensions
  *
  * @author Ernesto Baschny <ernst@cron-it.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MailMessage extends \Swift_Message {
 
diff --git a/typo3/sysext/core/Classes/Mail/Mailer.php b/typo3/sysext/core/Classes/Mail/Mailer.php
index 2a542bbf45561dc1a19c5277941e09e49d6acb2e..dc2882680b7c8475594ad8f0e0541cef80c722f7 100644
--- a/typo3/sysext/core/Classes/Mail/Mailer.php
+++ b/typo3/sysext/core/Classes/Mail/Mailer.php
@@ -11,8 +11,6 @@ require_once PATH_typo3 . 'contrib/swiftmailer/swift_required.php';
  * for it to work out-of-the-box.
  *
  * @author Ernesto Baschny <ernst@cron-it.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Mailer extends \Swift_Mailer {
 
diff --git a/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php b/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
index 094560704f6f37cd6f94348e0293cf779b6f2a73..b1b38e62fdd6a5b680db98643c2d1a7b3267f5e8 100644
--- a/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
+++ b/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Mail;
  * Mailer Adapter interface
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface MailerAdapterInterface
 {
diff --git a/typo3/sysext/core/Classes/Mail/MboxTransport.php b/typo3/sysext/core/Classes/Mail/MboxTransport.php
index f1e7afead661c7a209f2664a1c1e356beed42051..bcddf06410ac121c5644b2373b9532a36fb17100 100644
--- a/typo3/sysext/core/Classes/Mail/MboxTransport.php
+++ b/typo3/sysext/core/Classes/Mail/MboxTransport.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Mail;
  * for it to work out-of-the-box.
  *
  * @author Ernesto Baschny <ernst@cron-it.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MboxTransport implements \Swift_Transport {
 
diff --git a/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php b/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
index fc930d8b066a85c9d68ee0061a7fe57dbffd8b74..21916a5482b3180fd51fa16b45cb00e6d33d888f 100644
--- a/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
+++ b/typo3/sysext/core/Classes/Mail/SwiftMailerAdapter.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Mail;
  * Hook subscriber for using Swift Mailer with the t3lib_utility_mail function
  *
  * @author Jigal van Hemert <jigal@xs4all.nl>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SwiftMailerAdapter implements \TYPO3\CMS\Core\Mail\MailerAdapterInterface {
 
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 7123d8b055cee252a10d64775d65d93fa2a02ce1..22874362d2874fe869f9f34b61c457e5cefde234 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Messaging;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage t3lib/message
  */
 abstract class AbstractMessage {
 
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
index f4bc8ad9a92e06115c8be15d3493f19655526b4b..bc16777e009f5a38618b3b884097ed4da1ff6b0c 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Messaging;
  * Abstract class as base for standalone messages (error pages etc.)
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib/message
  */
 abstract class AbstractStandaloneMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
 
diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
index 4dc8284816c38598dc6b433d6c1b7035176cde1f..50a9d63271f0a02b9f44d93c35c717ddf45f689e 100644
--- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Messaging;
  * Classic Example: "No pages are found on rootlevel"
  *
  * @author Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage t3lib/message
  */
 class ErrorpageMessage extends \TYPO3\CMS\Core\Messaging\AbstractStandaloneMessage {
 
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index 2096287d78a613df3824f66fc0c0649c654ace30..93d5d759f41073ad2d63b4b22a2cb00ded2f9407 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Messaging;
  * A class representing flash messages.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
 
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php b/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
index 31ea6b588257ed9166ee99ab9ad6ad8af953f778..ccc80acfd069d0f3ccf89912aa40f6716a915f7e 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessageQueue.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Messaging;
  * A class which collects and renders flash messages.
  *
  * @author Rupert Germann <rupi@gmx.li>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FlashMessageQueue {
 
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index ddf6aeffe5711b41302e05479a6910366fee6258..abeefc1fc12b5c1efea4c1148447508da811cec4 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Page;
  *
  * @author Steffen Kamper <info@sk-typo3.de>
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Registry.php b/typo3/sysext/core/Classes/Registry.php
index ef8ebf70eb43ee7653fc88d8b4aa7a2e64c263b3..b9c311d8a7fb8f2bf580a5aad0e1c8dfa40ecdda 100644
--- a/typo3/sysext/core/Classes/Registry.php
+++ b/typo3/sysext/core/Classes/Registry.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Core;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Bastian Waidelich <bastian@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Registry implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/AbstractFile.php b/typo3/sysext/core/Classes/Resource/AbstractFile.php
index f57bb974d61ad6ed0c8ebd1c4004cc51ee7b2154..70b1e7ebfca9bc80ee453d034e77793976319237 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractFile.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractFile.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * Abstract file representation in the file abstraction layer.
  *
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractFile implements \TYPO3\CMS\Core\Resource\FileInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/AbstractRepository.php b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
index 47d2b9690ae43a1996ea158f85b01045f9cea96d..676e48ebf2ce0a3869714fa412700b407527aab9 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractRepository.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractRepository implements \TYPO3\CMS\Extbase\Persistence\RepositoryInterface, \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/Collection/AbstractFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/AbstractFileCollection.php
index 1be7253cf3bb1ef1766d122debdb8dfbc66e65d3..b13134e90d50f55c874659568fbe97a1156c9e46 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/AbstractFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/AbstractFileCollection.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Collection;
  * Abstract collection.
  *
  * @author Steffen Ritter <steffen.ritter@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractFileCollection extends \TYPO3\CMS\Core\Collection\AbstractRecordCollection {
 
diff --git a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
index 068753ca1e1b3d5e72502162c10a3d68a305fa02..18e008817efaf6bb9ceb6384671813bf43f0fba8 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource\Collection;
  * This collection is persisted to the database with the accordant folder reference.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FolderBasedFileCollection extends \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection {
 
diff --git a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
index e97db3e7d0ecd0307e1f2f5d4d1baeb6309deda6..aa358509ff8f707dfadb6cf1875a86f64d497252 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource\Collection;
  * to the database with references to all files it contains.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class StaticFileCollection extends \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection {
 
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
index 07498242567054578c3c1b6f42503b7a94d490ca..50b1e727654b2fcdca4e9f5658875f4af5a874c6 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource\Driver;
  *
  * @author Ingmar Schlecht <ingmar.schlecht@typo3.org>
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package 	TYPO3
- * @subpackage 	t3lib
  */
 abstract class AbstractDriver {
 
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
index 1c7125e9187a5d9a70d8fa7ede87d9e2bbefaa51..25de4a45b66418db07331609941d18758df85aa1 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Driver;
  * Registry for driver classes.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index 8618e550b072f2a519e7952c462aa7afbc241ff0..97402143902c687e1b9d626e8ca43a44c2133d28 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Driver;
  * Driver for the local file system
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package 	TYPO3
- * @subpackage 	t3lib
  */
 class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception.php b/typo3/sysext/core/Classes/Resource/Exception.php
index 24d3b4614f200ec0b8eb183e6abfc24ccb2aad63..e1cb4b28651176e848752cd87fcc39f814fd3981 100644
--- a/typo3/sysext/core/Classes/Resource/Exception.php
+++ b/typo3/sysext/core/Classes/Resource/Exception.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class Exception extends \TYPO3\CMS\Core\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php b/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
index 1eecf7b06ca50b776433c6e88e9c8a4aafab4e49..48f285ce49a24bab0f12eba4af97288c1ac4c402 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/AbstractFileOperationException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 abstract class AbstractFileOperationException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
index 7afa944bb11e5ab04192ff018aca0b79fa1072c4..698ec390afe3cd4037d08709b939fb8510c311dc 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFileNameException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class ExistingTargetFileNameException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
index 12d1633500daf404a1a3c9cc49ecd90d19f6cbf1..cb4e9701b1df524d70991b76ae53352dfa4389ae 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/ExistingTargetFolderException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class ExistingTargetFolderException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php b/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
index bfc288862adf1748c5a537caf6dbcc119e640fbd..1afee2a0493c236befa41560ac5179a283f1afc4 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FileDoesNotExistException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception to throw if a file does not exist
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class FileDoesNotExistException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php b/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
index 94e34556086b2661a278b3a558aadb6309049835..fc84cbdc4134c289c294823c1f0b59a3ac36d287 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FileOperationErrorException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class FileOperationErrorException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php b/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
index 1b017651562079fc9f57e95dc006e218ca71e778..dde8cc9e19d55ff4cc7d7227b5e983b76644511a 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/FolderDoesNotExistException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception to throw if a folder does not exist
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class FolderDoesNotExistException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php b/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
index 1e528ec886b5f564e47d87b77d1bb5220a709022..8c864d03a31f4745d41ac35f193d6ae8d89bcddc 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/IllegalFileExtensionException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class IllegalFileExtensionException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
index f914531ab0865738d6b202107798f1665161ff3c..877d80e975e70ac7edff709643e43ac56b364db2 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileAccessPermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFileAccessPermissionsException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
index 82feda2fb34e3bd3458677d3fe87787d5339d92c..488ae91c2508febd0084d15fbd792efa001534d5 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileReadPermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFileReadPermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
index 0bb3a800420683d10a14b3e96f68e82c03f08b37..4a35c3fdd55997279a8a2d52b294391572f64db3 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFileWritePermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFileWritePermissionsException extends \TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
index 5d5008bb110d17822ff9afcbd7dcfc76aecad103..0f84d04f0858663ffc6f78d60cd06a7f541b80f6 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderAccessPermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFolderAccessPermissionsException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
index 2fdb233c5a2ac93273fc84122e7480f37a3108be..047fe152f86fa28a296257c4bb3fd2fdb2f4dc39 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderReadPermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFolderReadPermissionsException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
index facd7d41b052dcd22a5bbf3212ad41937673f520..11acdcf728abc4bbb0db5146c6d55fb914d50600 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientFolderWritePermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientFolderWritePermissionsException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php b/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
index 880758226a15c0b75ae788d176bbbf9598c0f32d..f223241cb8289902cb4d8030ab5ee61f244c90a9 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InsufficientUserPermissionsException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InsufficientUserPermissionsException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
index a8d83e534fb097915243a1189b52caaaaf34a7c3..d6ab666a051d673d35154bd3305f04ac368554da 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidConfigurationException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the configuration
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidConfigurationException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
index c0607d0a40c3ac27d171393620152d3396335e7c..85484639563a2a029c48fb4777d8047527e88a80 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the File
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidFileException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
index 431330a15845f8d904e40c130f2719b0f869402c..883f65906da0c4e113a17208e0d79df80b76d49c 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFileNameException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the File name
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidFileNameException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
index aa92d0fa2f41757beff435456cb8ff0883bf82d2..ea87c55f9b603b38d5c182d19b4b81b2f913af27 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidFolderException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the Folder
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidFolderException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
index 168bc72b6e6599b9779d348417795879cb35b88f..aae1d9e94924c68ce2a4657ec35d55f8fce111a9 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidPathException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the path
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidPathException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php b/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
index 18baff84e4b323ca225ab9e38627e417941c75d4..24f602303c0d219473d3ae053640c7c16555f2e9 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/InvalidTargetFolderException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the file handling
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class InvalidTargetFolderException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php b/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
index cdfd91ec8c8dc9287cdfb6b806b2b9810db70d74..720cd46fca7100b009e983a122f6ce34e34621a5 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/NotInMountPointException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when something is wrong with the Mount Point
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class NotInMountPointException extends \TYPO3\CMS\Core\Resource\Exception {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/UploadException.php b/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
index 0a32e5cc1cd39e4a8ad58e954ae19e30e372d63e..1634e66e93389ab7566aa62ab2a9ac490ef069f4 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/UploadException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when the upload goes wrong
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class UploadException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException {
 
diff --git a/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php b/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
index 08a9852192a190530d634c8f99f0247ea597b353..8c585aa7e87a73b38d6c4d3d207832afa22228c4 100644
--- a/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
+++ b/typo3/sysext/core/Classes/Resource/Exception/UploadSizeException.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Exception;
 /**
  * An exception when the size of the uploaded file has exceeded
  *
- * @package TYPO3
- * @subpackage t3lib_file
  */
 class UploadSizeException extends \TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException {
 
diff --git a/typo3/sysext/core/Classes/Resource/File.php b/typo3/sysext/core/Classes/Resource/File.php
index 2a6cd1f2ccde2208b30b1aff3a52b352a02583e6..0797d84eaf860a6558bdb0accf6f479f8447c47b 100644
--- a/typo3/sysext/core/Classes/Resource/File.php
+++ b/typo3/sysext/core/Classes/Resource/File.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * File representation in the file abstraction layer.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class File extends \TYPO3\CMS\Core\Resource\AbstractFile {
 
diff --git a/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php b/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
index b8b9ad8a1df0cc412bfe1bd2c11a96d450479826..f61a8e6c5c1b792434f6dd39b187af72247681a6 100644
--- a/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileCollectionRepository extends \TYPO3\CMS\Core\Collection\RecordCollectionRepository {
 
diff --git a/typo3/sysext/core/Classes/Resource/FileInterface.php b/typo3/sysext/core/Classes/Resource/FileInterface.php
index 29266d06211de0deef10fe233503dd419a8ab06e..8e5d3f0b774110609971f80892499e94b58383e7 100644
--- a/typo3/sysext/core/Classes/Resource/FileInterface.php
+++ b/typo3/sysext/core/Classes/Resource/FileInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * File Interface
  *
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface FileInterface extends \TYPO3\CMS\Core\Resource\ResourceInterface {
 	/*******************************
diff --git a/typo3/sysext/core/Classes/Resource/FileReference.php b/typo3/sysext/core/Classes/Resource/FileReference.php
index cec4b7574685913ea5ae22ffe90afbd13ad793da..38894e4cc38769db653dc43f64e9ea8bb363e241 100644
--- a/typo3/sysext/core/Classes/Resource/FileReference.php
+++ b/typo3/sysext/core/Classes/Resource/FileReference.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Resource;
  * of the file.
  *
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileReference implements \TYPO3\CMS\Core\Resource\FileInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/FileRepository.php b/typo3/sysext/core/Classes/Resource/FileRepository.php
index 14688efb68954e74ad12af628b77717ec1f979a3..b217fb0f85c979b0a4bde98c3522c427eb367604 100644
--- a/typo3/sysext/core/Classes/Resource/FileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileRepository.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package 	TYPO3
- * @subpackage 	t3lib
  */
 class FileRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
 
diff --git a/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php b/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
index a3acea1e5cd52b07324dedc7c6e9f29d86783b17..dcedec47474d8e9a17c47f4c07fcc8301a8dbfe5 100644
--- a/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
+++ b/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Filter;
  * Utility methods for filtering filenames
  *
  * @author Ingmar Schlecht <ingmar.schlecht@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileExtensionFilter {
 
diff --git a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
index 05ec369bbbe652f1998da5f208dcbb90de20837a..942442cdf1bb7080da6898201b84f3e6d72f9d19 100644
--- a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
+++ b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Filter;
  * Utility methods for filtering filenames
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileNameFilter {
 
diff --git a/typo3/sysext/core/Classes/Resource/Folder.php b/typo3/sysext/core/Classes/Resource/Folder.php
index 0140774f809af1e7f38c6855d61ac0f2bb03e5ca..8688886d384c02e100e896b36fabb54d0a1f229c 100644
--- a/typo3/sysext/core/Classes/Resource/Folder.php
+++ b/typo3/sysext/core/Classes/Resource/Folder.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class Folder implements \TYPO3\CMS\Core\Resource\FolderInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/FolderInterface.php b/typo3/sysext/core/Classes/Resource/FolderInterface.php
index 0462e9b31653bc35b621064a069efc4d84403664..c10d074c97ac6f69b3d168aabbc99c6f37a152ea 100644
--- a/typo3/sysext/core/Classes/Resource/FolderInterface.php
+++ b/typo3/sysext/core/Classes/Resource/FolderInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * Interface for folders
  *
  * @author Andreas Wolf <andreas.wolf@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface FolderInterface extends \TYPO3\CMS\Core\Resource\ResourceInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php b/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
index c134a9c69757ccf0f1c748305ff4d6df6a23b0b6..e5cd39f9280e3c9fd13a4ee84b22e5f4d3fa0d99 100644
--- a/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
+++ b/typo3/sysext/core/Classes/Resource/Hook/FileInfoHook.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Hook;
  * Utility class to render TCEforms information about a sys_file record
  *
  * @author Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileInfoHook {
 
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index 2bfb1f87edf408780108c5098a1e118e5e7eac2c..8809d8c65220d6588d38ea9b0c084dd8a6a057a6 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * Representation of a specific processing of a file.
  *
  * @author Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ProcessedFile extends \TYPO3\CMS\Core\Resource\AbstractFile {
 
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php b/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
index c67e8f8d1bd2adcf34e3046410665e2b54156501..a134bed12ee76c72f75c207eb21e15b028a99a4b 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFileRepository.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Benjamin Mack <benni@typo3.org>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package 	TYPO3
- * @subpackage 	t3lib
  */
 class ProcessedFileRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
 
diff --git a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
index 33b3cb588e6b606096f4ee46f23bc1bd7a22d109..d1e4311a00bfc360a7c102b5037c999646e1fbb1 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Resource;
  * This merges and compresses CSS and JavaScript files of the TYPO3 Backend.
  *
  * @author 	Steffen Gebert <steffen@steffen-gebert.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ResourceCompressor {
 
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index 8d4c15e7753e79dbcf9ee8d53037e4a440167574..fca328e60d835b4ca6d7456e3b22726f8dd74ec6 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Resource;
  * NOTE: This class is part of the lowlevel FAL API and should not be used from outside the FAL package.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ResourceFactory implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/ResourceInterface.php b/typo3/sysext/core/Classes/Resource/ResourceInterface.php
index 67af2d88d638bd0206eb9fad560aa6d850a997bd..470e15a806437b960d62af2f8914d6b834cf3a37 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceInterface.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource;
  * FileResourceInterface
  *
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ResourceInterface
 {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index 251983cfdb2cbac16a55f02813cf4713031c9390..a74f1b1d90cfa5bd45c19032b116f334ea506e43 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -63,8 +63,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ResourceStorage {
 
diff --git a/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php b/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
index ba99ed75499227631330d1c844234022d38d1e79..60c57dac8550b10853b4e30b1fb72005f1d4dfd7 100644
--- a/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * File processing service
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileProcessingService {
 
diff --git a/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php b/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
index 68f3724a30d47e11de5eb5c90d8df658946615f0..42f025306a523077a0470c1da4ddaa9008652acf 100644
--- a/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
@@ -26,7 +26,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
 /**
  * Tslib content adapter to modify $row array ($cObj->data[]) for backwards compatibility
  *
- * @package TYPO3
  * @author Ingmar Schlecht <ingmar@typo3.org>
  * @license http://www.gnu.org/copyleft/gpl.html
  */
diff --git a/typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php b/typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
index 6363ad50f1249f19a6e5507d9267c37436a5cbe7..b22fa7dc079bb05dbc82c550c6d8cb7451f2deac 100644
--- a/typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/ImageProcessingService.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * Thumbnail service
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ImageProcessingService {
 
diff --git a/typo3/sysext/core/Classes/Resource/Service/IndexerService.php b/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
index 527f8cca12f7af02676b6061f5810989f1bb80ec..57027b943c729776bae79a1904cecd6669c344fd 100644
--- a/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * should only be accessed through the FileRepository for now
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IndexerService implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php b/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
index 1d7f27d097129a6ed04ea84f912ca8832467d13b..69076db773decd6edac3e9112a742f31fbb634ca 100644
--- a/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/MagicImageService.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * Magic image service
  *
  * @author Stanislas Rolland <stanislas.rolland@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MagicImageService {
 
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
index dec4201322df01139a887f327a8354885eeba480..b9e2d31ab3628ab7356c889146efcab195d2ddc4 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Resource\Service;
  * Note: This is now also used by sys_file_category table (fieldname "folder")! (Ingmar Schlecht, 19 November 2011)
  *
  * @author Benjamin Mack <benni@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class UserFileMountService {
 
diff --git a/typo3/sysext/core/Classes/Resource/StorageRepository.php b/typo3/sysext/core/Classes/Resource/StorageRepository.php
index 14a63a6a85b3c191392bd909dfc84bee8c030043..0f7a229b5afc790f7561f27913e1db5dd8206432 100644
--- a/typo3/sysext/core/Classes/Resource/StorageRepository.php
+++ b/typo3/sysext/core/Classes/Resource/StorageRepository.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Resource;
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @author Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class StorageRepository extends \TYPO3\CMS\Core\Resource\AbstractRepository {
 
diff --git a/typo3/sysext/core/Classes/Service/AbstractService.php b/typo3/sysext/core/Classes/Service/AbstractService.php
index 63ac2d3d21e61dbbf2770a0ea74f237a3f42831d..5a4774f3d9a7983f6b3ab3de3228d90c6866a954 100644
--- a/typo3/sysext/core/Classes/Service/AbstractService.php
+++ b/typo3/sysext/core/Classes/Service/AbstractService.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Core\Service;
  * Parent class for "Services" classes
  *
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class AbstractService {
 
diff --git a/typo3/sysext/core/Classes/SingletonInterface.php b/typo3/sysext/core/Classes/SingletonInterface.php
index d3a0650c988a11b9a02c6fd6ce1117c4e72360cd..f7041a1720f622abce8e73f26b1b95d3290424f2 100644
--- a/typo3/sysext/core/Classes/SingletonInterface.php
+++ b/typo3/sysext/core/Classes/SingletonInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core;
  * "empty" interface for singletons (marker interface pattern)
  *
  * @author Martin Kutschker <masi@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_div::makeInstance()
  */
 interface SingletonInterface
diff --git a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
index adc2ecf87521d390dfbda2cea4905228fa10b0b6..e8f550eb811df3873b6e454b68004655614a4e9c 100644
--- a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\TimeTracker;
  * This is done to save some performance over the real time tracker.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class NullTimeTracker {
 
diff --git a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
index 8c0859679b7a455f83a0fddd8ce01d625fd91547..5c777d060015502885de1f9b89662322b296fc94 100644
--- a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Core\TimeTracker;
  * Used by index_ts
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_tsfeBeUserAuth, tslib_fe, tslib_cObj, TSpagegen
  */
 class TimeTracker {
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index b4f34707220568d5271f78667261be3dd0b48ee1..05efebc7f2fb9d85d26cb85f5797415461535f20 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -30,7 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * An abstract TCA tree data provider
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
  */
 abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 7e01815c6a1e9ee3f4183a9226ebaf18d95776a0..d4ba91550e4adac2ce512044340a4a61184863e3 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * TCA tree data provider
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib_tree
  */
 class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\AbstractTableConfigurationTreeDataProvider {
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
index fcdf5f4aa00bb35a20418993d809e9da18646c0c..dd95ff7e9f2c6325f46e73ff2422750267ba7a54 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * Represents a node in a TCA database setup
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib_tree
  */
 class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/ExtJsArrayTreeRenderer.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/ExtJsArrayTreeRenderer.php
index 90868f61423c367bc6c06819e7968871e4609e82..74126266ab6fc5d1a1551d2eaef32e942bcae0a9 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/ExtJsArrayTreeRenderer.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/ExtJsArrayTreeRenderer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * Renders a tca tree array for ExtJS
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib_tree
  */
 class ExtJsArrayTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\ExtJsJsonTreeRenderer {
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/TableConfigurationTree.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/TableConfigurationTree.php
index a7ec2ccfb29ed51331be040690433b6cf4a19090..3c481a43d46ce41dfc18586115d239aa0b17f0f5 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/TableConfigurationTree.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/TableConfigurationTree.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * Class for tca tree
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib_tree
  */
 class TableConfigurationTree extends \TYPO3\CMS\Backend\Tree\AbstractTree {
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
index ff8079a1496db45c70cd46c04c26df88f5d53f96..f6415001499e41671727bbc629baea7728e2a0b9 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/TreeDataProviderFactory.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
  * Builds a t3lib_tree_Tca_DatabaseTreeDataProvider object based on some TCA configuration
  *
  * @author Steffen Ritter <info@steffen-ritter.net>
- * @package TYPO3
- * @subpackage t3lib_tree
  */
 class TreeDataProviderFactory {
 
diff --git a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
index ac6bdcbe43c9044ed3ede1fac03f7ff1d7291701..5344e039e412098b8816befd5da753e9c435fb10 100644
--- a/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
+++ b/typo3/sysext/core/Classes/TypoScript/ConfigurationForm.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\TypoScript;
  * Provides a simplified layer for making Constant Editor style configuration forms
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConfigurationForm extends \TYPO3\CMS\Core\TypoScript\ExtendedTemplateService {
 
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 5182cd08819107ece08d32f990c761abdb4c4449..137ffc124f61de2fa90e76f1c62b2609730f095f 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\TypoScript;
  * Contains functions for the TS module in TYPO3 backend
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService {
 
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 3109ad079050170110f04e5be57e0a967b8a0823..4a07d75b5c8838bbb374302bcf8679d1456751d9 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Core\TypoScript\Parser;
  * The TypoScript parser
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_tstemplate, t3lib_BEfunc::getPagesTSconfig(), t3lib_beUserAuth::fetchGroupData(), t3lib_TStemplate::generateConfig()
  */
 class TypoScriptParser {
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index 3c8e43f63883dad62b39a610c69ebddb51f56ec4..12144a9a1d590349d863eca02d2384d655cb2405 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Core\TypoScript;
  * Template object that is responsible for generating the TypoScript template based on template records.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see 	t3lib_tsparser, t3lib_matchcondition_abstract
  */
 class TemplateService {
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index 63a265b889c74f018a8ebbdc329c5d4e2bc7fa79..a07e708ff263cba51d9d3d60f43f0a75bffd02cc 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class with helper functions for array handling
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ArrayUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/DebugUtility.php b/typo3/sysext/core/Classes/Utility/DebugUtility.php
index 32cd142670eb6c15459749ac5b00edef4da890eb..e0f7e0488875ab949f8a7205a3cee929b17608f0 100644
--- a/typo3/sysext/core/Classes/Utility/DebugUtility.php
+++ b/typo3/sysext/core/Classes/Utility/DebugUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class to handle debug
  *
  * @author Steffen Kamper <steffen@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DebugUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/DiffUtility.php b/typo3/sysext/core/Classes/Utility/DiffUtility.php
index 50411f38bdc40714c9c95af6f4b6372f4386c4da..9c2129258d336621fa287141a19143389cd4bf4c 100644
--- a/typo3/sysext/core/Classes/Utility/DiffUtility.php
+++ b/typo3/sysext/core/Classes/Utility/DiffUtility.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Utility;
  * This class has functions which generates a difference output of a content string
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DiffUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 6e2b443f13f0ce6dc959401a6644024307431014..5998ab89e0009c9b18b3d2167c5ed60eb962997b 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Core\Utility;
  * t3lib_extMgm::isLoaded('my_extension');
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtensionManagementUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
index 5490741b20bfb7223eb19720071a7ae2c1933f4f..50f9f0d415bc65288a6f26dafaaeb2a2b132c889 100644
--- a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Core\Utility\File;
  * Contains functions for management, validation etc of files in TYPO3, using the concepts of web- and ftp-space. Please see the comment for the init() function
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see t3lib_basicFileFunctions::init()
  */
 class BasicFileUtility {
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index 1d12ad814362d4d36854bec252d563e6a4d5b571..e888294db6247825636aa79d1460e410e0835c9c 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -59,8 +59,6 @@ namespace TYPO3\CMS\Core\Utility\File;
  * For example this is a bad idea: you have an ftp-space that is '/www/' and a web-space that is '/www/htdocs/'
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
index a4ed3ed11a58b0069bf8f2ed11ac017e480ad316..bf295dd92fb7c12599acb7c56e2bb91460785a1a 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtilityProcessDataHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility\File;
  * Interface for classes which hook into extFileFunctions and do additional processData processing.
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ExtendedFileUtilityProcessDataHookInterface
 {
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index c96f071976df0ed4e46cae9ee96c9a1ad3e4f7dd..8211ede5697286f7d884a3e08b46bab6153430c0 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Core\Utility;
  * So use t3lib_div::[method-name] to refer to the functions, eg. 't3lib_div::milliseconds()'
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class GeneralUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/HttpUtility.php b/typo3/sysext/core/Classes/Utility/HttpUtility.php
index afd130161951eeb83fdcd950ff7a4cdc5129385f..4a05424273fe3728cd6dfeaae294c8e67b804fd3 100644
--- a/typo3/sysext/core/Classes/Utility/HttpUtility.php
+++ b/typo3/sysext/core/Classes/Utility/HttpUtility.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Utility;
  * HTTP Utility class
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class HttpUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/MailUtility.php b/typo3/sysext/core/Classes/Utility/MailUtility.php
index f69838c2f0fd0bc2ba853fc2363bc22e65202cb0..8eeac85b049e1f6f591257d14ed1d2a4b6585efb 100644
--- a/typo3/sysext/core/Classes/Utility/MailUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MailUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class to handle mail specific functionality
  *
  * @author Tolleiv Nietsch <nietsch@aoemedia.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MailUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/MathUtility.php b/typo3/sysext/core/Classes/Utility/MathUtility.php
index 45d9b29f4053e761916e7309ad04857e1c78524e..ed2f2118462a056671846ab795ae250800a3e580 100644
--- a/typo3/sysext/core/Classes/Utility/MathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MathUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class with helper functions for mathematical calculations
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MathUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/PathUtility.php b/typo3/sysext/core/Classes/Utility/PathUtility.php
index 7156ea4ec27aabffd36c03e912ead5539af3d78a..0b9c597f59756e30c0925df950a2bf2eb4e876ce 100644
--- a/typo3/sysext/core/Classes/Utility/PathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PathUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class with helper functions for file paths.
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PathUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php b/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
index 8448d6072a18a75a1f500766bd7b01a16f950a87..27bd33427e1b9a1d8d2e73173b093fcca3985177 100644
--- a/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class to handle php environment specific options / functions
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PhpOptionsUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index 07993e11e98a5e9d67750beb3788b07e43ea5664..5d0e7d3517699d303d208dbcdbda6943f9e1ee4d 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Utility;
  * A utility resolving and Caching the Rootline generation
  *
  * @author Steffen Ritter <steffen.ritter@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RootlineUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/StringUtility.php b/typo3/sysext/core/Classes/Utility/StringUtility.php
index 30514e89635eda3fdcaf682188d4467c80d77260..9f66a83517e5b9c87cb2239725c9482760f6a650 100644
--- a/typo3/sysext/core/Classes/Utility/StringUtility.php
+++ b/typo3/sysext/core/Classes/Utility/StringUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class with helper functions for string handling
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class StringUtility {
 
diff --git a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
index f81fee6b760db65259ffb57094323c386d1e5e98..ea7fd712b3197d4599cb322c9d3f8d32c1ca73a2 100644
--- a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
+++ b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Utility;
  * Class with helper functions for version number handling
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class VersionNumberUtility {
 
diff --git a/typo3/sysext/core/Tests/AccessibleObjectInterface.php b/typo3/sysext/core/Tests/AccessibleObjectInterface.php
index fb58ed43384ed8df89ceda682b257accef4c44bb..a20b1ae123af1b121327230a8a000993c977c06b 100644
--- a/typo3/sysext/core/Tests/AccessibleObjectInterface.php
+++ b/typo3/sysext/core/Tests/AccessibleObjectInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests;
 /**
  * This interface defines the methods provided by TYPO3\CMS\Core\Tests\TestCase::getAccessibleMock.::
  *
- * @package TYPO3
- *
  * @author Nicole Cordes <nicole.cordes@googlemail.com>
  */
 interface AccessibleObjectInterface {
diff --git a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
index 797f031533ec249320342a885ad8722c9b566e92..1d2658e2cb100de886a610e8fb4df090b411ffe7 100644
--- a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\Category\Collection;
 /**
  * Test case for t3lib_category_CategoryCollection
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Fabien Udriot <fabien.udriot@typo3.org>
  */
 class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Functional/Resource/BaseTestCase.php
index 0769370eaf0acef625172280087ec5b1a8839c8d..95a13ad7117b35afaf557f92dec07966c8fe8ea9 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/BaseTestCase.php
@@ -33,8 +33,6 @@ require_once 'vfsStream/vfsStream.php';
  * Basic functional test class for the File Abstraction Layer (FAL).
  *
  * @author Andreas Wolf <andreas.wolf@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class BaseTestCase extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase {
 	public function getStorageObject() {
diff --git a/typo3/sysext/core/Tests/Functional/Resource/FolderTest.php b/typo3/sysext/core/Tests/Functional/Resource/FolderTest.php
index ba6569f0c1a6cebceea220d164fbc331a7aebdbb..12b667ba01ea31bacaaa466ef080a253bade753d 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/FolderTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/FolderTest.php
@@ -35,7 +35,6 @@ require_once 'vfsStream/vfsStream.php';
  * Functional test case for the FAL folder class.
  *
  * @author Andreas Wolf <andreas.wolf@typo3.org>
- * @package TYPO3
  */
 class FolderTest extends BaseTestCase {
 
diff --git a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
index 1bd98a1ccf2be671d7e435fdd28c3827aace8220..b011a75d9f083e43f4051133300946940849b70b 100644
--- a/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
@@ -33,8 +33,6 @@ require_once 'vfsStream/vfsStream.php';
  * Functional test case for the FAL Storage.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ResourceStorageTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase {
 
diff --git a/typo3/sysext/core/Tests/Legacy/t3lib/class.t3lib_formmailTest.php b/typo3/sysext/core/Tests/Legacy/t3lib/class.t3lib_formmailTest.php
index e9291bc7181d6f05d61509330e950e7515ee62bc..07a93893a9ba7f6446d157ec72476aee249e9f4d 100644
--- a/typo3/sysext/core/Tests/Legacy/t3lib/class.t3lib_formmailTest.php
+++ b/typo3/sysext/core/Tests/Legacy/t3lib/class.t3lib_formmailTest.php
@@ -29,8 +29,6 @@
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  *
- * @package TYPO3
- * @subpackage t3lib
  */
 class t3lib_formmailTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php b/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
index 75c1057de0f16bd1526977140826927674f92906..a582dd0d7371785d6a1f89fe7c95cfafe54fc180 100644
--- a/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
+++ b/typo3/sysext/core/Tests/Legacy/typo3/contrib/class.removexssTest.php
@@ -28,8 +28,6 @@ require_once(PATH_typo3 . 'contrib/RemoveXSS/RemoveXSS.php');
  * Testcase for class RemoveXSS
  *
  * @author	Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage contrib
  * @ see http://ha.ckers.org/xss.html
  * @ examples from http://ha.ckers.org/xssAttacks.xml
  */
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index 63d5d13ded7db2eaa300fa3da61ae066bac9d38f..583440b97d52546a113cc1387a266597b864d38e 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Authentication;
 /**
  * Testcase for class \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication
  *
- * @package TYPO3
- * @subpackage t3lib
  */
 class AbstractUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 1a5fb842bf0934253756f040d537280baf8bd0b5..fa405add473e1f19a19362cd2c433e2c04c77edb 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Authentication;
 /**
  * Testcase for \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
index 21d6755359db23075b5dd5e586b862551ca58aa6..611c7e4f65a2f09cd7f73cb42cfb4651e5c11c51 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/AbstractBackendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class AbstractBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
index 979efc8c73a655336a02801a7b34807d2dbf2396..871ab246289eac51e52f5487817b39aa625ebc67 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/DbBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/DbBackendTest.php
index 3c82db238515df801ed063f05d07b6ff05b4a722..42f9e3a7b8ae70269f54e4853ae0d4d3c16273ca 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/DbBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/DbBackendTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * Testcase for the DB cache backend
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class DbBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index 868d22d26d7fbbfd9fb3266d3e4201ec0e472df7..6c1c274d7a11f002edf4e37a2e6bd4ebfaf4d24e 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tests
  */
 class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
index 4563a9c2aaf5844c2e3624b742488bc47e2efdce..8c087cdeb7c496ddb038bf65554158fe0e0f9647 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class MemcachedBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
index 5e21da909a718e91ae60391c1d454a93f8224739..ea5a2aedd2d56e29fe172cbbd57d39bc4a4cb774 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MockBackend.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * This file is a backport from FLOW3
  *
  * @author Robert Lemke <robert@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class MockBackend extends \TYPO3\CMS\Core\Cache\Backend\NullBackend {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
index a94fe2e5f380005a04b927118ba842853cbae542..70b84c2cf104f62adb4ec6abc0d9f9273166cb76 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * Testcase for the PDO cache backend
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tests
  */
 class PdoBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index 59a41b5c5e0677f76b7aba3247c33e77460ebb9d..56ab1caac834276cf54c50b7b3f862d1f261890b 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * The unit tests use and flush redis database numbers 0 and 1!
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tests
  */
 class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
index 5c52c42140bf9f16bda7de9f4a5776c35c9d39ff..ac8498566b3d3013100050e80839f998de853428 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
index 14286e04d40b47150bd5a53c9b226639e6df9eb3..3beb27f8e97355a68a5fface6614e6d6de6e27f1 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Backend;
  * Testcase for the WinCache cache backend
  *
  * @author Tobias Burger <tobias_burger@hotmail.com>
- * @package TYPO3
- * @subpackage tests
  */
 class WincacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
index 35141f5f66fe520b4c18151e6dcacef01a900f9a..97da685aedfd690ca92d02561b9d99baea5deb7a 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class CacheManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php b/typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php
index 0b8d1316deb1846e9e08d0e50b64d8cc772c35a4..c94d94f3346b48b9df9604d4afacfa06fbeb2bc3 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php
@@ -32,8 +32,6 @@ require_once 'Backend/MockBackend.php';
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class FactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
index 4c361d8f4c2fa78ad3ea7c4e6fc122c34b5d59f4..a73475fcdacf8c0280b27683663dd07005f8ad01 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
index 848dc27ec80e38bc0f501a92625a26f9247f9fc4..8f062ac61b8f8dbec985a04da479fb13d4f877b3 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  * This file is a backport from FLOW3
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tests
  */
 class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
index 0fbe60cc688651d78a83b28e748f420d2831f295..ee1f0cfaa86574ff849123374d9cc6879341dddf 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
index 1c0d80ca5b41831cbd0555e839574d52707b2401..613647b61b7d589702b6ca128ed3cfb434f36828 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache\Frontend;
  * This file is a backport from FLOW3
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
index 9dbc5d5ec4c61fa7de547d00b91761aeeb780a88..ce3b75b9277b3d80f3a4dd1cf13accf0fcf145c3 100644
--- a/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Category;
 /**
  * Testcase for CategoryRegistry
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Hader <oliver.hader@typo3.org>
  */
 class CategoryRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
index b8e956202156a6135859de0ee55fbe34bc1e0c2f..b313d266c586d114147e5d9de4e7f30ed0e44a7a 100644
--- a/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Category/Collection/CategoryCollectionTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Category\Collection;
 /**
  * Test case for t3lib_category_CategoryCollection
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Fabien Udriot <fabien.udriot@typo3.org>
  */
 class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
index cf7c42499144d6e1fa8464e90337ffaaf30477a0..2f7f071de802a843b68ecedf7fb2bf068aecc77c 100644
--- a/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Charset/CharsetConverterTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Charset;
 /**
  * Testcase for \TYPO3\CMS\Core\Charset\CharsetConverter
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class CharsetConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php b/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
index 010bbfc8dd1c76214736bdc4365c109c5fb99733..02ce35753c99aac33af23bd50caaa42a097bb594 100644
--- a/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Collection;
  * Test case for \TYPO3\CMS\Core\Collection\RecordCollectionRepository
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
index 027dd00fd50d81b9b26b1c8cea0c5aae5857b442..9dd6a406794c26c3a752ba1cdf21d99e3a1c82af 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Configuration;
  * Testcase for class \TYPO3\CMS\Core\Configuration\ConfigurationManager
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
index 3058b87143176dd0f668443999199174cdd6778e..5c6d604a41e761cd2c9279f0896e90700c1025cb 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Core;
 /**
  * Testcase for TYPO3\CMS\Core\Core\ClassLoader
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  */
 class ClassLoaderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Core/Fixtures/LegacyClassFixture.php b/typo3/sysext/core/Tests/Unit/Core/Fixtures/LegacyClassFixture.php
index 35bc6204a0185d065bfde997e31a6ed5b846198f..df9d6e0625c66cc6b2ad6ec34fc0ab2623f799f0 100644
--- a/typo3/sysext/core/Tests/Unit/Core/Fixtures/LegacyClassFixture.php
+++ b/typo3/sysext/core/Tests/Unit/Core/Fixtures/LegacyClassFixture.php
@@ -26,8 +26,6 @@
 /**
  * Test Fixture class for TYPO3\CMS\Core\Core\ClassLoader
  *
- * @package TYPO3
- * @subpackage core
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
 abstract class Tx_Core_Tests_Unit_Core_Fixtures_LegacyClassFixture {
diff --git a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
index 7ece35eb201c9dd3d7a08d9a9a5eda18c69e3165..838ae2e5d2d1e2cbb8dea2a4076ebc40c64a5b7e 100644
--- a/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Core;
  * Testcase
  *
  * @author Christia Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tests
  */
 class SystemEnvironmentBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index 0f10d6beeef11ffb21cfce6cb42ec417a9ee17f3..83a0e38ad339fc40ba416a48294c1ed2cd158cee 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\DataHandler;
 /**
  * Testcase for TYPO3\CMS\Core\DataHandling\DataHandler
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Tolleiv Nietsch <info@tolleiv.de>
  */
diff --git a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
index 670bf42773b4cbefd066f663b90ec7480520feba..717c88a3d7f4750874ece040c3932b26feac144a 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
 /**
  * Testcase for TYPO3\CMS\Core\Database\DatabaseConnection
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Ernesto Baschny <ernst@cron-it.de>
  */
 class DatabaseConnectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index 1707a9b8d084590a22e498b9d6cd6aa6ddcd5850..7901c63610e10a0057ed168ca71650a6639bc83c 100644
--- a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
  * Testcase for the prepared statement database class
  *
  * @author 	Helmut Hummel <helmut@typo3.org>
- * @package TYPO3
- * @subpackage tests
  */
 class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Database/SqlParserTest.php b/typo3/sysext/core/Tests/Unit/Database/SqlParserTest.php
index 6221e17a9e021e85043e535c9eee31f894a44b90..a2db9997ed5a5d920c51c6b704a38d6697fed89a 100644
--- a/typo3/sysext/core/Tests/Unit/Database/SqlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/SqlParserTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Database;
  * Testcase for TYPO3\CMS\Core\Database\SqlParser
  *
  * @author Patrick Schriner <patrick.schriner@diemedialen.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SqlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php b/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
index 160c3bd561e515b1bf085ce97791427f6924b2a3..fe282314edeb330e6facf4f767947f2cadf6b17a 100644
--- a/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Encoder/JavaScriptEncoderTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Encoder;
 /**
  * Test cases for TYPO3\CMS\Core\Encoder\JavaScriptEncoder.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
 class JavaScriptEncoderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
index d05cb3b1610db33918fdfd9010167c3b25d4f71f..ebe442b65fc87e401ebce436f0932f9842f0e383 100644
--- a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Error;
  * testcase for the DebugExceptionHandler class.
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib_error
  */
 class DebugExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
index 8bf53377892fc23f05470de7913ee1989b66931f..9bde6dac0f202e99238d3e02480b31517c7153ac 100644
--- a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Error;
  * testcase for the \TYPO3\CMS\Core\Error\ProductionExceptionHandler class.
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib_error
  */
 class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index 573c451b85f45e785fb21983c295be610a9e8175..e25159f5fe39bf39725d21c64be9016387020da6 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
@@ -29,8 +29,6 @@ require_once 'Fixtures/FormProtectionTesting.php';
 /**
  * Testcase for the t3lib_formprotection_Abstract class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
index 11eadbf33bf1bc33d536fddb544027895785e767..e5f8cd897b6c284182a14cf334a508e710cd9c21 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection;
 /**
  * Testcase for the \TYPO3\CMS\Core\FormProtection\BackendFormProtection class.
  *
- * @package TYPO3
- * @subpackage t3lib
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php b/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
index 265bcc132ac1f270233ca86cf9f31194590f2ca8..5c0c7be60bcb838c3a6ef2015666526fcbe1ddc2 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/Fixtures/FormProtectionTesting.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures;
  * This is a testing subclass of the abstract \TYPO3\CMS\Core\FormProtection\AbstractFormProtection
  * class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class FormProtectionTesting extends \TYPO3\CMS\Core\FormProtection\AbstractFormProtection {
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
index 832c70762082be4a709215737ad4f73b26a02004..751fab2575aa06416f09ce1fce510598a92c085d 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
@@ -29,8 +29,6 @@ require_once 'Fixtures/FormProtectionTesting.php';
 /**
  * Testcase for the t3lib_formprotection_Factory class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  * @author Ernesto Baschny <ernst@cron-it.de>
  */
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
index fa76ef86a0be28983594532518eeadacaba4f628..71190b244daa22def86fd5b53d274d7094a80995 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
@@ -29,8 +29,6 @@ require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('instal
 /**
  * Testcase for the \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection class.
  *
- * @package TYPO3
- * @subpackage t3lib
  *
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
diff --git a/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php b/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
index 1363d714c524a7ff1bb0b7acbab15f4d554342a5..f265158c13ded66524e83c902502763d6eb000a3 100644
--- a/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Html/RteHtmlParserTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Html;
 /**
  * Testcase for \TYPO3\CMS\Core\Html\RteHtmlParser
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Stanislas Rolland <typo3@sjbr.ca>
  */
 class RteHtmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
index 4bf26b93c931d6c3a85391ac625ee80124515c0a..49b875c00aadda6dcf1608ae2bf7f11c2d5a93c8 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/GraphicalFunctionsTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Imaging;
 /**
  * Testcase for \TYPO3\CMS\Core\Imaging\GraphicalFunctions
  *
- * @package TYPO3
- * @subpackage core
  * @author Wouter Wolters <typo3@wouterwolters.nl>
  */
 class GraphicalFunctionsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php b/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
index 21db17509a5bd41ef9924b879a2ecd599cbf5e67..f5ec1bd50ac0df26e600f48d2cdf28befd2af670 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
@@ -28,7 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Localization\Parser;
  * Testcase for class \TYPO3\CMS\Core\Localization\Parser\LocallangXmlParser.
  *
  * @author Xavier Perseguers <xavier@typo3.org>
- * @package TYPO3
  */
 class LocallangXmlParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php b/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
index ed275a66967b35c1ae87fc0df6368f0530a9f7db..e409eefcd9ccbabc23b02ef36fc651aae19284e6 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
@@ -28,7 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Localization\Parser;
  * Testcase for class \TYPO3\CMS\Core\Localization\Parser\XliffParser.
  *
  * @author Xavier Perseguers <xavier@typo3.org>
- * @package TYPO3
  */
 class XliffParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php b/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
index 7c22221905bb885a46db3880c858241468656a62..f12dbd393d8008fadfe8f0beff3420a0434280cf 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/LockerTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Locking;
  * Testcase for \TYPO3\CMS\Core\Locking\Locker
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LockerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php b/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
index e0b5908ad224ad14278899695f48075ea809e1f5..4e8cf430008ebee0d936659427c20f8b5bc0a7bc 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log;
  * Testcase for \TYPO3\CMS\Core\Log\Level.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LevelTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php b/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
index e62bf730f877049be1a5678a34ebca8a14ebd50d..bb53ef63750cb362f82ffb477fec08e96bbb1a0f 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LogManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php b/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
index 75f474026bf9563cb663fc6951d3970eddd65679..d3236b6633dbaf95f26f8f62424d7447deaac04a 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log;
  * Testcase for \TYPO3\CMS\Core\Log\LogRecord.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RecordTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
index 68f109800c6b77a615026a1796c90cc114fc2afa..243569767eb60e2fcb5bbedb4c2989126f8137f3 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
@@ -33,8 +33,6 @@ require_once 'Fixtures/WriterFailing.php';
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class LoggerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionTest.php
index 22a56c80834e5ee1268a03b9d0282bbaf0296a77..a905b813b9a44019a50a59ee50c7e1cd761454e8 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
  * Testcase for the web introspection processor.
  *
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IntrospectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageTest.php
index 35403735c92ebfedf04e9a9f6446bbfbac2ffb26..f6425f2bd4a76260e3bf8ed31b5881dd7a2c2d8c 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryPeakUsageTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
  * Testcase for the memoryPeakUsage log processor.
  *
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MemoryPeakUsageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageTest.php
index d2923815c41ab1f182082b62903205f2a3d96893..13ec16f3a8bc5a66e211e7bbd231714fa1c4d171 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/MemoryUsageTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
  * Testcase for the memoryUsage log processor.
  *
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MemoryUsageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/ProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/ProcessorTest.php
index 5eccfe2f95107f4f91f366f7d3c9d2488391909e..e6e8059c34b767da1850aa6d813bfaec5c468ff5 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/ProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/ProcessorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
  * Testcase for log processors.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase implements \TYPO3\CMS\Core\Log\Processor\ProcessorInterface {
 
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/WebTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/WebTest.php
index fb787452236b914e81d586117a6ed40b27be2b4b..cc19860684bbd06c7e6d7a26d0c0a247e4242ba3 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/WebTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/WebTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Processor;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Steffen Müller <typo3@t3node.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class WebTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
index f5621f735b8d8581b200937ac20a3f05b521cc1d..e39986b6a7972e4b2591f271d73755af2c6a04cb 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Mail;
 /**
  * Testcase for the TYPO3\CMS\Core\Mail\Mailer class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Helmut Hummel <helmut.hummel@typo3.org>
  */
 class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Mail/SwiftMailerAdapterTest.php b/typo3/sysext/core/Tests/Unit/Mail/SwiftMailerAdapterTest.php
index 1ac0928d0e26b8d6262ca4832fd08cd73176cf8f..2d5f8517d1379e20345c31b61853a3578b3b3a31 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/SwiftMailerAdapterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/SwiftMailerAdapterTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Mail;
 /**
  * Testcase for the \TYPO3\CMS\Core\Mail\SwiftMailerAdapter class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Ernesto Baschny <ernst@cron-it.de>
  */
 class SwiftMailerAdapterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
index 48adab7a84464f631768d3b41dade8302b5e3731..7317d5edd0e838691779c9c330a2659f045880ba 100644
--- a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Page;
 /**
  * Testcase for \TYPO3\CMS\Core\Page\PageRenderer
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Steffen Kamper (info@sk-typo3.de)
  */
 class PageRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/RegistryTest.php b/typo3/sysext/core/Tests/Unit/RegistryTest.php
index b5c0dd3a736e7c463553b52079abe8e1ed77ae0d..755bbd7bc8bdd5400152389693dd440e09d1b3ff 100644
--- a/typo3/sysext/core/Tests/Unit/RegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/RegistryTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit;
  * Testcase for TYPO3\CMS\Core\Registry
  *
  * @author 	Bastian Waidelich <bastian@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
index 3dc2e846a8e3f2f5c361cdbb53515bcca6b6cd61..25b028ac7963524132b9965946072e9ffc03d547 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource;
  * Basic test case for the t3lib_file tests
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 abstract class BaseTestCase extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
index daa87cdded7ba0ac29bb7a2141a29343e7f3bf05..26dcad96cafbe2e702da4e41b17820c4fffd968a 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
@@ -33,8 +33,6 @@ require_once dirname(__FILE__) . '/../BaseTestCase.php';
  * Test case for the abstract driver.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class AbstractDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
index 34e39e29de28e42e25ac469982f0d01b4dbbb247..9aa0ecbc332d88fd6122082e62ab2e697de03eb1 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Driver;
  * Testcase for the FAL driver registry.
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class DriverRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
index e2d410eddd9dfad80154983b2dccbe25d876ce27..15b8be8b249d5655e2efcbeceaf17d82cbb23255 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
@@ -34,8 +34,6 @@ require_once dirname(__FILE__) . '/Fixtures/LocalDriverFilenameFilter.php';
 /**
  * Testcase for the local storage driver class of the TYPO3 VFS
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  */
 class LocalDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/FactoryTest.php
index f994e7e4fecc6f5892c0792d20e7f208416e9777..c7e4240a94e06070f3dace0eadb03cacb8e529bc 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FactoryTest.php
@@ -29,8 +29,6 @@ require_once 'vfsStream/vfsStream.php';
 /**
  * Testcase for the factory of FAL
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  */
 class FactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
index 3d230ee52775dae11ccca3f5630bc34893daae32..aee89c71608be50a7ab357038226ebc78ac28ae8 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
@@ -29,8 +29,6 @@ require_once 'vfsStream/vfsStream.php';
 /**
  * Testcase for the file class of the TYPO3 FAL
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  * @todo Many, many, many tests are skipped in this test case...
  */
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
index ee81d720931fdaf5ecf4629cb20f06c071cecd66..d59af8484501a0a678a43afada70b319f42ac8e2 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
@@ -32,8 +32,6 @@ require_once 'vfsStream/vfsStream.php';
 /**
  * Testcase for the storage collection class of the TYPO3 FAL
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  */
 class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
index 6a55af3bdfa43d1699bda3f89b751dcf9862dd74..36f1f62b06adc46460e4db3a47829ef69ef21507 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Repository;
  * Testcase for the abstract repository base class
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class AbstractRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
index 1eb8379d1db7a86ea96d502e027d75cebf764252..ea4a83665416ecb92a86c7f49d2f14dd637e8fcd 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
@@ -29,8 +29,6 @@ require_once 'vfsStream/vfsStream.php';
 /**
  * Testcase for the VFS mount class
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
  */
 class ResourceStorageTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Service/IndexerServiceTest.php b/typo3/sysext/core/Tests/Unit/Resource/Service/IndexerServiceTest.php
index 1dcc89f62b7311bbff6c847c390278773b11f70f..9fa262ec9e97832c7c1f71fd2a9a92418c6e9f29 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Service/IndexerServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Service/IndexerServiceTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Service;
  * Testcase for the file indexing service
  *
  * @author Andreas Wolf <andreas.wolf@ikt-werk.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class IndexerServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
index fe528325be58a580781acd7f571b542715cdae23..63e76a38d4d6a0b4feb2c12e350ad2020979eb72 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Resource\Utility;
  * Test suite for filtering files by their extensions.
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class FileExtensionFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
index 349bc6924644c08aab08bc8b4186d78f109b25be..93753005c674abecc52ad8f31a8115d0dd3d323c 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\TypoScript;
 /**
  * Testcase for \TYPO3\CMS\Core\TypoScript\TemplateService
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  */
 class TemplateServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
index 292f66d960e48f3489adbfd3767754448d6a75c3..2d7db3a8196d3fcb1f22a46b492de4b250f66e0b 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ArrayUtilityTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ArrayUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
index 33babc4f96e35d3f59afd3188621a75b84c20ab4..f73514bb9e8caa3f0025fdb65b990c84affd42bc 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ClientUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Core\Utility\ClientUtility class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Steffen Kamper <info@sk-typo3.de>
  */
 class ClientUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php
index 0a8110283613dba3427a32ac602aeb4bb0788ef5..d15596e708c40ef70c4c5dca10f3571a863937fb 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ExtensionMangementUtilityTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  *
  * @author Oliver Hader <oliver@typo3.org>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtensionManagementUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
index 5dfc012c167d665305804e69c2c7eff1f6356649..f9ae712576f3453c528b7dcd1a0c0b9e04dfdddf 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility\File;
  * Testcase for TYPO3\CMS\Core\Utility\File\ExtendedFileUtility
  *
  * @author Fabien Udriot <fabien.udriot@ecodev.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ExtendedFileUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
index 2e70dc85cebaf45345d71087763fa74ac4e11453..48c2d5271fee3e7c130e6a899399f3a31b798529 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures;
  *
  * This is a fixture subclass for t3lib_utility_math
  *
- * @package TYPO3
- * @subpackage t3lib
  */
 class MathUtilityTestClassWithStringRepresentationFixture {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/RootlineUtilityTestAccessibleFixture.php b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/RootlineUtilityTestAccessibleFixture.php
index cfc7cf2b20afa3676e6ab31c614d3f5cd4b5194b..6b4db4b2263e45de5491368fb714f12f22c5b0e9 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/Fixtures/RootlineUtilityTestAccessibleFixture.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/Fixtures/RootlineUtilityTestAccessibleFixture.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility\Fixtures;
  * Make method public
  *
  * @author Steffen Ritter <steffen.ritter@typo3.org>
- * @package TYPO3
- * @subpackage test
  */
 class RootlineUtilityTestAccessibleFixture extends \TYPO3\CMS\Core\Utility\RootlineUtility {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index 9f73546bd26a65f384ceabc4ba89c64893e4ae69..c51a4bc6eef928aef56403ce41b8a7b1f97f9ba9 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -30,8 +30,6 @@ use TYPO3\CMS\Core\Utility;
  *
  * @author Ingo Renner <ingo@typo3.org>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
index 63dbe07e2449f92aa28346867e5ab79ba47fc597..d7df51d5f29a26dcc20cbe6aa9222ea42024973a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/HttpUtilityTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  * Testcase for class \TYPO3\CMS\Core\Utility\HttpUtility
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class HttpUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
index 359a3295ef3e4fad7f3213a505ae0d25851be3f3..32c92c149d362945d0135d8939a7e7a7184ae224 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/MailUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Core\Utility\MailUtility class.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class MailUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
index 6682aec453f71b450c5911562bca621dc3759b95..3e29d60d1c4e89b34d034b4cfefbbeaa8284ed5d 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/MathUtilityTest.php
@@ -30,8 +30,6 @@ require_once 'Fixtures/MathUtilityTestClassWithStringRepresentationFixture.php';
  * Testcase for class \TYPO3\CMS\Core\Utility\MathUtility
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class MathUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
index 879eed81c694c36ab0b0ee06a7bae2beaa3e8b7b..2c3bfcd7489121c76693abba0e537dd7115bbb7a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/PathUtilityTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  * Testcase for class \TYPO3\CMS\Core\Utility\PathUtility
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PathUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
index c0c7092bebd3523b6d5215b2e88a3f20e4b25a7e..5d0e87b2f24f7b145d1f529af2bf5babdc427fe0 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
@@ -30,8 +30,6 @@ require_once __DIR__ . '/Fixtures/RootlineUtilityTestAccessibleFixture.php';
  * Testcase for class \TYPO3\CMS\Core\Utility\RootlineUtility
  *
  * @author Steffen Ritter <steffen.ritter@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
index 4ece7c32040cc92155824bb44a35fc47f9dfbfc0..2b08879054a7e2b3f6e9aed9df3d2ad15935d5f2 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  * Testcase for class \TYPO3\CMS\Core\Utility\StringUtility
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class StringUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
index 2b924bc52a3a0cf05c0312a72c89686f5b21a8e1..06f7b48d9305878fc114df599d68d4abd9ff33d3 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/VersionNumberUtilityTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Utility;
  * Testcase for class \TYPO3\CMS\Core\Utility\VersionNumberUtility
  *
  * @author Susanne Moog <typo3@susanne-moog.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class VersionNumberUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
index 1d8cdb3d0c03df68b23b040c720e60e2398d5ff9..ad3e7580ef1cf5eceb77ada442a906c010adf872 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Cshmanual\Controller;
  * Script Class for rendering the Context Sensitive Help documents, either the single display in the small pop-up window or the full-table view in the larger window.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class HelpModuleController {
 
diff --git a/typo3/sysext/cshmanual/mod/index.php b/typo3/sysext/cshmanual/mod/index.php
index dc91ee53b873134ecfab717ca3ae1c46fc4047e3..f2f27ea2ae0db7f315cab207ae1a7af4f4e21b77 100644
--- a/typo3/sysext/cshmanual/mod/index.php
+++ b/typo3/sysext/cshmanual/mod/index.php
@@ -28,8 +28,6 @@
  * Extension of the parse_html class.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class local_t3lib_parsehtml extends \TYPO3\CMS\Core\Html\HtmlParser {
 
diff --git a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
index e0cf608e81fcd5e1ec69594eb1501638ebd8b70f..44d2bfb5ad016f9bdb39430d41da3c48c4f2e792 100644
--- a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
+++ b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\CssStyledContent\Controller;
  * Rendering some content elements from tt_content table.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_cssstyledcontent
  */
 class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
index 2f7625b3e01c440304d8916e04112fcc4d8daa7d..a92ab3383850060dbdb54f1ba128118dbad9dbc4 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/AbstractController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Abstract action controller.
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage controller
  */
 class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
index 94546088ae9586992531a98bd6db1b4d06427b57..9a8243a48d76527a6fb2624ed69b2c7797813bb8 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * installing, removing, downloading of data or files
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class ActionController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
index 694da55f544ad47795c0e61fbbe3bd7c06af2d21..f14c7a8931eee44513dd34dde8f154d8110b1281 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ConfigurationController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Controller for configuration related actions.
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class ConfigurationController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 1f63bd433e891586e07c0abf668b25f48d262ae4..ab5626e3794a54a657c75bbb7d7e41347046187f 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Controller for actions related to the TER download of an extension
  *
  * @author Susanne Moog, <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class DownloadController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
index 9e5bac2d5f385881cdcad0bc4afbad6163c8dce7..c6cda03956e34cc2f4ea05aa0a68c4a71dbc3565 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Controller for extension listings (TER or local extensions)
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class ListController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
index fdca2b11f82486205ab01520d0d7d5b84e9ba54a..8a29c9e13529254ededf8c4e4c5c68a8d3ebc1c5 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UpdateFromTerController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Controller for actions relating to update of full extension list from TER
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class UpdateFromTerController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
index 85e2dcf2005da13845ff55c28bf0f2127f927da3..faf7ffef38fd2e043c83e4005ad724e7da3dfde9 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Extensionmanager\Controller;
  * Handles .t3x or .zip files
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Controller
  */
 class UploadExtensionFileController extends \TYPO3\CMS\Extensionmanager\Controller\AbstractController {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
index 8d0ce9c4faa9fa4579398bb91c5d5e0fa3ef1313..c477319ba7b85ddfc169f3fe5e28a07e8b3a9984 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationCategory.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Main model for extension configuration categories
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class ConfigurationCategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
index 7d6fd00ac91a11deaee5e7919b6bae43361e2f47..bf3667f7e32e71ff36b8aee0aa701239a775b870 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Model for extension configuration items
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
index 00ff51adbdc2ab3c396a2fe265010719960d5bb3..fabb35a0147a962ee2d1751d289753bb19fd36fa 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationSubcategory.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Model for configuration subcategories
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class ConfigurationSubcategory extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
index 9e03f851bae6eb2a24527123b1e092bc4d15aa1a..8457495ef493b28f832d803a3f87113bee6d8107 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Dependency.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Main extension model
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class Dependency extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
index dfe42d6002fc26d2ba9f13f389448418506e5555..78ab516c39ccc7fcf597750aeb7fba6189dd8a96 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/DownloadQueue.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Download Queue - storage for extensions to be downloaded
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class DownloadQueue implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 03d38e8c5056ee9009fcbab78ee394eaa5bfba46..d5b2c968bfba47b83f4152adc4d954310c46fa8a 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * Main extension model
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Model
  */
 class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
index 3d3bca528a181d8a29ab3b663e0e2a3478b02e49..a12965521f0ca78403e04768d252975eb7b817d1 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-11
- * @package Extension Manager
- * @subpackage Model
  */
 class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
index b896813b1a63d4ac274104f209e20ee82e838568..32f892ade6b7eff8873698a5d4a0b8c00ffb7be6 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Model;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-11
- * @package Extension Manager
- * @subpackage Model
  */
 class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
index 67fbd19dec11fb46c7f69519507c4b25c1f5aa48..0332865ce81739ffc39be984228128c7b9282903 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ConfigurationItemRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Repository;
  * A repository for extension configuration items
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Repository
  */
 class ConfigurationItemRepository {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index c14376f08bb1f0139fda9fe0f9af81ade3b6b8ba..18ac89f66969948f1180cb6e1ed062f43adc5133 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Repository;
  * A repository for extensions
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Repository
  */
 class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
index b9eefad1b4e01b7bdb6977f60435a6717a33dfa6..e167824ce2b4f6d238c18742a4766dfc0e5a94c0 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Repository;
  * A repository for extension repositories
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Repository
  */
 class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Exception/ExtensionManagerException.php b/typo3/sysext/extensionmanager/Classes/Exception/ExtensionManagerException.php
index 933c81af119efe8537e77698522ef3eadbaa403a..1f4df7303a789f76d11d9b840f523e65d29ec68c 100644
--- a/typo3/sysext/extensionmanager/Classes/Exception/ExtensionManagerException.php
+++ b/typo3/sysext/extensionmanager/Classes/Exception/ExtensionManagerException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Exception;
  * An exception when something is wrong within the extension manager
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Exception
  */
 class ExtensionManagerException extends \TYPO3\CMS\Core\Exception {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
index 6800dca31c282e9459c10e4b7810e0983110748c..3516f14c66a9f28a19b3e1a4b3e48e35b0463ff2 100644
--- a/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
+++ b/typo3/sysext/extensionmanager/Classes/Service/ExtensionManagementService.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Service;
  * Service class for managing multiple step processes (dependencies for example)
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class ExtensionManagementService implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
index 1b51c67c29982502040f4359f1e6bd9609f5a0e3..2df8d3951652e49aab70be2a923927f58c2d562a 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ConfigurationUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Utility for dealing with ext_emconf
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class ConfigurationUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
index 76edd8ef55d2dfd5bbb9dbd0513ae453f3a25932..b421c815bdc56792a5da743128cef01180e1d006 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Connection/TerUtility.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Connection;
  *
  * @author Karsten Dambekalns <karsten@typo3.org>
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage EM
  */
 class TerUtility {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php
index b4cc2a3e052d7f3d45a1f3ea2f47609f49d63aaa..23f025fe9a8af7ff2b7fa11c4b4634633e21eeb8 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DatabaseUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Utility for dealing with database related operations
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class DatabaseUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
index be4e0d1c410af321c71a26d876ee432e3ce066a0..1a59da3707cb187003ceaa0395d87f421cdd9924 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Utility for dealing with dependencies
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
index 3cc7ac89f0bc41ae9dbeea91db0e1b8e41ae873f..6aee351c1aed7cce2cf98f8057d0d5d758ab699f 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Utility for dealing with ext_emconf
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class DownloadUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php
index 0e8b346356a5a30923326cc57e4c047e2e47ac8b..4bc2f24c3a7bc538140f28660824cd1ac3df9cf9 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/EmConfUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Utility for dealing with ext_emconf
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class EmConfUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
index 2f01e956a7869de3e645ad1f6efeaad783efb52a..ed5e768c8fa0b21967c20a7f4bd819896a7b0adc 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
@@ -31,8 +31,6 @@ use \TYPO3\CMS\Core\Utility\GeneralUtility;
  * Utility for dealing with files and folders
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index 310ec64ac4c697166909e8a3b11ab7cc96463ee6..2a6b4c70577053431969753104e383094140c56c 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Importer;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-10
- * @package Extension Manager
- * @subpackage Utility/Importer
  */
 class ExtensionListUtility implements \SplObserver {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
index da051ce03b92b1d6d6b5c91e83d5a78fb2f388f2..4d70d3a9a96377c43a62dbeb2e354d66014df9f4 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/MirrorListUtility.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Importer;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-10
- * @package Extension Manager
- * @subpackage Utility/Importer
  */
 class MirrorListUtility implements \SplObserver {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
index da6946528e5fb82fbade8f8b521fee91fa57095b..4f8ca2cc66b5dbbd71381c6a7bb3a54d8e3ac3d1 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * Extension Manager Install Utility
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage Utility
  */
 class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
index f62dd89d50ac035748f61298de3df168d51363b6..84b8089a8936c6bf539c5ce2cce046277a9652f6 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility;
  * - The name 'listUtility' is not good, the methods could be moved to some 'extensionInformationUtility', or a repository?
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage Utility
  */
 class ListUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
index 1362f18ad6e1bd5a2df06599744fd40bf5eec944..493949fb4a45dcbb936b66f60f060d74cbbc5175 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-09
- * @package TYPO3
- * @subpackage EM
  */
 abstract class AbstractExtensionXmlParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractXmlParser {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
index 07f0515db2ca2b746cd16e86c282b01c8076237f..29123fb526241d831e2be45d9106bec7d690bc71 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractMirrorXmlParser.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-09
- * @package Extension Manager
- * @subpackage Utility/Parser
  */
 abstract class AbstractMirrorXmlParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractXmlParser {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
index 6137fe28e2026ea950327c5dc19db32cc83ef8ec..8f572cce3216ea184493b32265bc0fea38255a9b 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-09
- * @package Extension Manager
- * @subpackage Utility/Parser
  */
 abstract class AbstractXmlParser {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
index fc7e4691c5e8424d71db7026c9f264a4ea4b748c..d065ae0661ba3fa330a5542b7391f10762889ae0 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author 	  Marcus Krause <marcus#exp2010@t3sec.info>
  * @author 	  Steffen Kamper <info@sk-typo3.de>
  * @since 	   2010-02-09
- * @package 	 TYPO3
- * @subpackage EM
  */
 class ExtensionXmlPullParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractExtensionXmlParser implements \SplSubject {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index 27b8bb96ec92dfcf7e7bda2b307fb7e382d43f0b..38f302b033c5c352a53f393cb6b2b2a4fd1efb7e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-10
- * @package TYPO3
- * @subpackage EM
  */
 class ExtensionXmlPushParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractExtensionXmlParser implements \SplSubject {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
index 3ddf83d431d5c31bfff0f52d60b213098d3aafba..6f44ae7f9739c3076182df4ed9bbfed31a0e2bd2 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @autho Steffen Kamper <info@sk-typo3.de>
  * @sincer 2010-02-19
- * @package Extension Manager
- * @subpackage Utility/Parser
  */
 class MirrorXmlPullParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractMirrorXmlParser implements \SplSubject {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
index c8577303ccb6834dfc545031ed2da38730bb7779..0b734cd102ba916aac050b4bea40a829fbe952f7 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-11-17
- * @package Extension Manager
- * @subpackage Utility/Parser
  */
 class MirrorXmlPushParser extends \TYPO3\CMS\Extensionmanager\Utility\Parser\AbstractMirrorXmlParser implements \SplSubject {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
index 93752194322ef54697bdd8b6e2c090439b01189c..fdb851cbc404ce5d30c44108bc3b2931f5974b58 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/XmlParserFactory.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
  * @since 2010-02-10
- * @package Extension Manager
- * @subpackage Utility/Parser
  */
 class XmlParserFactory {
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
index 0a0dcf482412ca96e51d5f896db751cd17c22fbf..aa7d9c9ac2f3e6784bab93fee29dbad247075723 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Repository;
  *
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package Extension Manager
- * @subpackage Utility/Repository
  */
 class Helper implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
index 2cd0b4a8ef036d5cb471174eb61c54a21a84153c..3c5d550ddd127f3f3217a406948afab9a8bdedd9 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ConfigureExtensionViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * View helper for configure extension link
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class ConfigureExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
index e9ca08896d79d4d674901e09f84824ff5e4b8852..dc3168bbab0233dbb792d256af42e14fc08dba4e 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionDataViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * view helper for displaying a download extension data link
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class DownloadExtensionDataViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
index bc7543628588840961b94953a42ce3e549c9c157..d4854752fd0bd4d6532ecb2e7c8ca4848e505006 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * view helper
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class DownloadExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
index 4b34c9f5c8aa92638d1e2a4a208567975a1eaac3..a0cf6bc5997ab6323fbedd875ae04c3a643b2c87 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Form/TypoScriptConstantsViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Form;
  * View Helper for rendering Extension Manager Configuration Form
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class TypoScriptConstantsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
index 583f6c9187ed2b7276c28c283dd476cdd2da94a8..5a96478aa3c1505b77c6527c8c93627be64feb2d 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/Format/ImplodeViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers\Format;
  * View Helper for imploding arrays
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class ImplodeViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
index dc8cc87160e923e39575acf6aedbc5fb2ab3546b..e4f573750ba15686885d828dfe790c1cf62c0bf4 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/InstallationStateCssClassViewHelper.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * available or installed
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class InstallationStateCssClassViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
index d28bedf9d964b9d15e97846b2bb8370e64cc71b8..d2281ba7d6d1e4cec1ef470b2f490deff44e6e3f 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * view helper for displaying a remove extension link
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class RemoveExtensionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ShowExtensionVersionsViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ShowExtensionVersionsViewHelper.php
index bf7ddf071c6392a4419ab86fe4587f9f8caf6d88..d4afe5c36d39e2c2a7a06e557189774a458c3d96 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ShowExtensionVersionsViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ShowExtensionVersionsViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * Display a link to show all versions of an extension
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class ShowExtensionVersionsViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
index 5ee9ebdb2241a480c12a776359fd7954d8e210e1..ff7127a4652d945ce188430bada2d8f66f02adfa 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * Display a deactivate / activate link
  *
  * @author Susanne Moog <typo3@susannemoog.de>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class ToggleExtensionInstallationStateViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateFromTerViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateFromTerViewHelper.php
index 06405380c304815d93a41b12a19cc4ad02618797..7a9024f3e9af9bd603129e394e89a2223dcce67c 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateFromTerViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/UpdateFromTerViewHelper.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Extensionmanager\ViewHelpers;
  * Renders a link to update the extension list from TER
  *
  * @author Susanne Moog <susanne.moog@typo3.org>
- * @package Extension Manager
- * @subpackage ViewHelpers
  */
 class UpdateFromTerViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelper {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
index 9e1ee9c5a801ed60820cc046cff467aba9c1b873..819b737c58c0a47b15a011d2575a3bc5c0d5149a 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
 /**
  * Update from TER controller test
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class UpdateFromTerControllerTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
index 3941550c023a71050d6ca5a0430264506cbc804e..dcf1f683e78ef6dd398582a809b6eadeddac9527 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Model;
 /**
  * Download queue test
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class DownloadQueueTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
index 6aaff0ce7e32e08f02f4f1e7db4324df3968ccfe..57451d15a5a503cd57b38e8163dd3c49d8464661 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Domain\Repository;
 /**
  * Tests for ConfigurationItemRepository
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
index ff5f1017374a7692456a797679dd3f358cbc7708..968e9ed9e29e699b9ce15f5f549cbbabda7c3a4a 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Service;
 /**
  * Testcase
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class ExtensionManagementServiceTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
index 4224eff8155dd8767f02b26671daade7b0e45988..967863eb898933be7e702f27516bde8275b4e5c9 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Configuration utility test
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class ConfigurationUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index fe2c673cf3425c07b5d59dab0ca6bfe8af7a38f9..ad4b5e5e33f5215a4e5461eb32ecbc3cace13ea1 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Test for DependencyUtility
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class DependencyUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
index bb98451edc54c45573a7d6f0f2021f5b30e1451f..d461b44a911fd266ac276728c0177584bdcd8396 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * EmConf utility test
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class EmConfUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index 7b58dc62b97927948bb79b725e6460c738322f01..b349b5602d3acc27bbba559945c38d733fad80ce 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Testcase
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class FileHandlingUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
index 83af0e4917f300997414b4a86d3c6ba36e2f67a9..eef939a6196518b5b15b093f3249442effc27d59 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * Testcase
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class InstallUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
index 23590836875e3372bbaf18418cc1dad16bf42136..be3f6aedfe41e836ca2bd1fd544c9eac9793adad 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
 /**
  * List utility test
  *
- * @package Extension Manager
- * @subpackage Tests
  */
 class ListUtilityTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/extra_page_cm_options/Classes/ExtraPageContextMenuOptions.php b/typo3/sysext/extra_page_cm_options/Classes/ExtraPageContextMenuOptions.php
index 97dda422d7b7f63479ce91ccbebca24788508328..98175e4f178c945fcd766de20247c54e9f2aff03 100644
--- a/typo3/sysext/extra_page_cm_options/Classes/ExtraPageContextMenuOptions.php
+++ b/typo3/sysext/extra_page_cm_options/Classes/ExtraPageContextMenuOptions.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\ExtraPageCmOptions;
  * Class, adding extra context menu options
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_extrapagecmoptions
  */
 class ExtraPageContextMenuOptions {
 
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 8d92b903d146a92b70b92dc02af411609723628b..531b9245985ac88d933b781fac22c378f1f3f88f 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Feedit;
  *
  * @author Jeff Segars <jeff@webempoweredchurch.org>
  * @author David Slayback <dave@webempoweredchurch.org>
- * @package TYPO3
- * @subpackage feedit
  */
 class FrontendEditPanel {
 
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 04603990b4085ec59444f65dc16314c2f8752686..8bcbf9e1b62ecc2c3d2218944c09a6cb27f071f1 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Felogin\Controller;
  * Plugin 'Website User Login' for the 'felogin' extension.
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage felogin
  */
 class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 
diff --git a/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php b/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
index a9f4a5327d67e878e1fb6076ca653439db00a8f3..c7c383ebaac06b57c9ea12d56b756369f25118ad 100644
--- a/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
+++ b/typo3/sysext/felogin/Classes/Hooks/CmsLayout.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Felogin\Hooks;
 /**
  * Hook to display verbose information about the felogin plugin
  *
- * @package TYPO3
- * @subpackage felogin
  */
 class CmsLayout implements \TYPO3\CMS\Backend\View\PageLayoutViewDrawItemHookInterface {
 
diff --git a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
index f6e98a73ec6985c2041e9eb4b624540110d6f04c..989041020911826b39db53b6164abc20e2f6deff 100644
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Felogin\Tests\Unit\Controller;
  * Testcase for URL validation in class FrontendLoginController
  *
  * @author Helmut Hummel <helmut@typo3.org>
- * @package TYPO3
- * @subpackage felogin
  */
 class FrontendLoginTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index 55dd1f04d0bf97fb6c305888ec5bed18bba6ab08..28784a99fa85b7f8fe81a276aab18140843db1e3 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Filelist\Controller;
  * Script Class for creating the list of files in the File > Filelist module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FileListController {
 
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 8d809f8cf2c59335f11ed8e99d15eee6cef1ac7d..1d0fdb3c39d9f7c5bda5ce27d7c7f71e97878993 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Filelist;
  * Class for rendering of File>Filelist
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
 
diff --git a/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php b/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
index 859465c6bc92bef236be989fc3c3e9706ee33fb6..d1db91527e734539bcce31353aba5d6642be7424 100644
--- a/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
+++ b/typo3/sysext/filelist/Classes/FileListEditIconHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Filelist;
  * Interface for classes which hook into file list module and manipulateds edit icon array
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage cms
  */
 interface FileListEditIconHookInterface
 {
diff --git a/typo3/sysext/filelist/Classes/FileListFolderTree.php b/typo3/sysext/filelist/Classes/FileListFolderTree.php
index 3851614b87bb01ec33c3f558bcb431ddb9c2448c..cd9910c82f13774101776f41bde734a638df2d9b 100644
--- a/typo3/sysext/filelist/Classes/FileListFolderTree.php
+++ b/typo3/sysext/filelist/Classes/FileListFolderTree.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Filelist;
  *
  * @author Sebastian Kurfürst <sebastian@garbage-group.de>
  * @author Benjamin Mack   <bmack@xnos.org>
- * @package TYPO3
- * @subpackage core
  * @see class t3lib_browseTree
  */
 class FileListFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
diff --git a/typo3/sysext/form/Classes/Controller/FormController.php b/typo3/sysext/form/Classes/Controller/FormController.php
index d4acd618c8abd5f1b7685c36281999868da6ae54..81a261f7dd9c576bc22b431af0db111d5d72aa59 100644
--- a/typo3/sysext/form/Classes/Controller/FormController.php
+++ b/typo3/sysext/form/Classes/Controller/FormController.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Controller;
  * and are routed to the model and view layers for processing.
  *
  * @category Controller
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class FormController {
diff --git a/typo3/sysext/form/Classes/Controller/WizardController.php b/typo3/sysext/form/Classes/Controller/WizardController.php
index fca2d6997db1a5b0d843327fa4dabef18e180d42..354525ba2a02aba6bfa1b52ce376c1d049c27f75 100644
--- a/typo3/sysext/form/Classes/Controller/WizardController.php
+++ b/typo3/sysext/form/Classes/Controller/WizardController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Form\Controller;
  * The form wizard controller
  *
  * @category Controller
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class WizardController {
diff --git a/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php b/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
index 96dfb60dfd83bea505972140b2b0b9fd2998df67..fdd8b5944f1cfc935e76d196d014e602ac537566 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/JsonToTyposcript.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Form\Domain\Factory;
  * Takes the incoming Json and converts it to Typoscipt
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class JsonToTypoScript {
 
diff --git a/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php b/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
index 276239c062a57b7c391cf1f7ee98d5c7fafc3a38..4b270ff6b91415db97621cc337c0f70620a640a2 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Form\Domain\Factory;
  * according to the configuration.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TypoScriptFactory implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/AbstractAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/AbstractAdditionalElement.php
index 948448759c77d93bdfce4133250636bd28d9bec5..09c5e38b2db5c3216fa96159efc7b92703d0e3f5 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/AbstractAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/AbstractAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Abstract for additional
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
index 87df8d8a0ca8a28871d8f96000798c5a732286e2..47253f9253478122ccde93c3fe4e420ebe761a07 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Additional elements for FORM object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AdditionalAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/ErrorAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/ErrorAdditionalElement.php
index 7a303936eff5f0cec3371abf2eadcfcca38c5e26..7173a7bba9207baa085a993bef3a6f357b463c49 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/ErrorAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/ErrorAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Additional 'error'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ErrorAdditionalElement extends \TYPO3\CMS\Form\Domain\Model\Additional\AbstractAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/LabelAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/LabelAdditionalElement.php
index 6b26be06f0392e03f23b74661a1f3d98f6c1945a..eb08fd1960a1b1fe465f9dc64ca7fba98caf7129 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/LabelAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/LabelAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Additional 'label'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LabelAdditionalElement extends \TYPO3\CMS\Form\Domain\Model\Additional\AbstractAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/LegendAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/LegendAdditionalElement.php
index 8dc5fc2944394b29d9f9e682f457c777193d6888..f286439b56d06cad49ad7efe7b86b75b8494e4dd 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/LegendAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/LegendAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Additional 'legend'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LegendAdditionalElement extends \TYPO3\CMS\Form\Domain\Model\Additional\AbstractAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/MandatoryAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/MandatoryAdditionalElement.php
index 18ed8f44f7cd13105b251563a93b3ce055380fba..25f821dbc8adef9983d8480c1c534c7575684834 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/MandatoryAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/MandatoryAdditionalElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Additional;
  * Additional 'mandatory'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MandatoryAdditionalElement extends \TYPO3\CMS\Form\Domain\Model\Additional\AbstractAdditionalElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
index 5c18b576c37e6767561e96552a63c03c656f8c49..fa1bf4aedd2b450593eed2472531abb240a5979e 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Abstract for attribute objects
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptAttribute.php
index beff8cf029815098e6dc955df9902c09f6ad1564..695316a9a4abae492bd5817bfc79607fe79e09d7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'accept'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AcceptAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptCharsetAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptCharsetAttribute.php
index 2e1f74569fc7ec0a06819cf6814a74bf67f6a8bc..ee93f663610275f1a5cd80e4eccc93002844a2c6 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptCharsetAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AcceptCharsetAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'acceptcharset'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AcceptCharsetAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AccesskeyAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AccesskeyAttribute.php
index 2ff3a31768bacbd7b632c62e80c2cf9625cc3db9..283d19cabec8ece81f5b378cb854ce01e7d4a77a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AccesskeyAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AccesskeyAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'accesskey'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AccesskeyAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ActionAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ActionAttribute.php
index 8a39561b78aa0e17ebe5093fb39653f9648aced5..db578ff3e5a92e2ba9e77a272db97b2887c5d567 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ActionAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ActionAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'action'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ActionAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AltAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AltAttribute.php
index d20a06d8a0d9859673f8ef39681235cd69938fbe..f4eeda65f8b937de29f39cecf4941121704eef35 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AltAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AltAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'alt'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AltAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
index a5b0b87583b6c2468c36649801e68ef0e913254e..66540e5f14d47c3ad4d9458120ded6d813c18c48 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute class for the form elements
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AttributesAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/CheckedAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/CheckedAttribute.php
index b7dca947bb8097e423d6916917c5b4bc29c0d910..7e77834c87e7a508d66e48707c5f102ba732559f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/CheckedAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/CheckedAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'checked'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckedAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ClassAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ClassAttribute.php
index 48fae48dd62d3d3b97142b60fc2eb36b4664bb56..87433089fe3a609b0fc30e5d230f63283f21ca49 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ClassAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ClassAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'class'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ClassAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
index ec9212627edee331975bdbbd87cbae210e0ab7ca..5aa382c70c73fcf32d645f4ca5b440204793c713 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'cols'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ColsAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/DirAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/DirAttribute.php
index 5d7685b7592f13f4dced2bc30fdaaeecb79484ae..f2383eb4b4e63e2b894f5041dbe6d7f47c06dbc4 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/DirAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/DirAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'dir'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class DirAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/DisabledAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/DisabledAttribute.php
index dc1930fc0b0b5d350c0e55222cada6a40e3d3dad..9c00cc4e5ecc2aa9d7e3da15efdcd7e4fdd36fa4 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/DisabledAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/DisabledAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'disabled'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class DisabledAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/EnctypeAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/EnctypeAttribute.php
index 85f7d514181a2ed9c8831e0ad41d5efcdc509623..30f57da4a6b895dd44920c52174955825c1cdbb3 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/EnctypeAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/EnctypeAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'enctype'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class EnctypeAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/IdAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/IdAttribute.php
index d8f3779b8c2051c0c9ed277c213da13274caaeb2..87326ef4bb1ed08986b57c48e90dd9060d9fdb3c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/IdAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/IdAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'id'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class IdAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/LabelAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/LabelAttribute.php
index df3027dd5aa6d0006bf072d9f4cc5b3f7df3bfe5..caef94910ce9835aadcc7f7a2ac4cb47085c1a42 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/LabelAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/LabelAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'label'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LabelAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/LangAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/LangAttribute.php
index 058017c02cdf8e0d3403d417ecdbfdbc395134ce..40095b5233bdf990ef0d56d30ea0266166961a45 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/LangAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/LangAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'lang'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LangAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
index 136212426a76e006771dcb896cfefe52fbb694de..4535378f2d6157bb5fd2cd18d47179a8b15acc18 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'maxlength'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MaxlengthAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/MethodAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/MethodAttribute.php
index ec53cb8a132091b6a588e2c6f68d3f983284cd13..dbbc7ebd11bc4008d7e77ded1c075b0ae4bedc08 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/MethodAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/MethodAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'method'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MethodAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/MultipleAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/MultipleAttribute.php
index 676c15ab55b33c6be1346889b3c8c54320a76789..f8affc7c2aad449d555e775d6c86108ae52d3395 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/MultipleAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/MultipleAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'multiple'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MultipleAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
index 9f155d3d060d56bc94e2eeaba8e1b106bc7018f4..e15598d7a157d4a033bf98f30bfd3b4344fe01d9 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'name'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class NameAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ReadonlyAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ReadonlyAttribute.php
index 47eec149a16c083b524e1175e7b7366c414c395c..e7da352d4198269b6653914b63a73a1888e5b54d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ReadonlyAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ReadonlyAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'readonly'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ReadonlyAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
index 33ba088688b73fd766d966b8178969a9fb530e82..41899203e3304f040e0e39dbe4660c1f99076ce8 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'rows'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RowsAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/SelectedAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/SelectedAttribute.php
index a04ce9a2c32feae67ec3585f1818406e5f4a70a2..f4983f9ac6fa238d42224902c2c0b944588d0267 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/SelectedAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/SelectedAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'selected'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectedAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
index a064a14d452b5021518e5f3d97810e9c886f606b..68d3d5cd005bc9b72c488daf414db0535f2df484 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'size'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SizeAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/SrcAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/SrcAttribute.php
index 949b8b5864079ed0f4ccb4f1430897aa347062a1..123fb53897e7c5a74cae386b53789c39b75ca21b 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/SrcAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/SrcAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'src'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SrcAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/StyleAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/StyleAttribute.php
index 19f5362647fcabf7fd4e16e5341869f82820a86e..00af68cb205c05ae1ebf3d6d2ec449f855b45203 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/StyleAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/StyleAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'style'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class StyleAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
index 35ffe2d7ab82e897d0e4b01d9460fb6492d0fa5d..99b346f6c1603bb1d243f77dcd298b77406941e1 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'tabindex'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TabindexAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/TitleAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/TitleAttribute.php
index 045660dc7d7ffc9aab2824edd462ef0948a4e0c1..be712a726f9d23f2159858351014da5b9c266c47 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/TitleAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/TitleAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'title'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TitleAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/TypeAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/TypeAttribute.php
index 4c6dd2f38686ac7eab5dd8af534990b5d72328ff..0eb20bb0aa9aa1b25829b537d6802fb82eeaeba2 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/TypeAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/TypeAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'type'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TypeAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ValueAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ValueAttribute.php
index 1d052961c414835c0561fff58e168eb2746d5e7d..0fca322777dfe2f5df4794d7287a97e5379deb44 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ValueAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ValueAttribute.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Attribute;
  * Attribute 'value'
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ValueAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttribute {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Content.php b/typo3/sysext/form/Classes/Domain/Model/Content.php
index 846a132dd80369ad8a6ad2871821454bdb439d36..bbf896f92b5fcab55a13ea025688bb68235de343 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Content.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model;
  * Content domain model
  *
  * @category Model
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class Content {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
index 03de446bf414319ef482bf47fcb7a73fee5084c2..28cfd10453a1f668b108b033965c614fcc51d5dd 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Abstract for the form elements
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractPlainElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractPlainElement.php
index 5d2d4c29e78c9147d884fe4458ac93003c16b788..c086910a8702c3d1eefb1c605e26e737293b0b56 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractPlainElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractPlainElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Hidden field model object
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class AbstractPlainElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/ButtonElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/ButtonElement.php
index 518335d210fda43368602624e2e1d8e17aa01487..fbe065601d65a4e6148255b0dc2dadbfb597ceb0 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/ButtonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/ButtonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Button model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ButtonElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
index 02273450b802d17563574bc406953dd9d6f11a74..10b6d2e198039e2e38a684d9b465e3c3fb93415a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Checkbox model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxGroupElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxGroupElement.php
index dd39b26aef9f820dd05e75a8ca94b90b3a71dddd..3848762c377bd78196dff00d97675c515cdcbcf2 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxGroupElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxGroupElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Checkbox group model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupElement extends \TYPO3\CMS\Form\Domain\Model\Element\FieldsetElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/ContainerElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/ContainerElement.php
index 6ef1651df187b0ee6183c0ff1fdecdf04de3d92e..77630b870c4cc0d1c5ae72e6a34d3391a2213273 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/ContainerElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/ContainerElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Class for the form container elements
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/ContentElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/ContentElement.php
index cfde2f6c192214b3d92517990df225e225c77440..78bbe5fdade7d0a018aaa082538d2733010ef469 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/ContentElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/ContentElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Content model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContentElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/FieldsetElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/FieldsetElement.php
index 60888caf1eba74e4dc865372623a31c3af4ac46c..b02358b3b518d519dafa481df639817cab4fef03 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/FieldsetElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/FieldsetElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Fieldset model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetElement extends \TYPO3\CMS\Form\Domain\Model\Element\ContainerElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
index 206ba6abba620758999b632f2d707dcdea5daa0d..435e6b4707b632c2caafb180205d7472c824d6e6 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * File upload model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/HeaderElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/HeaderElement.php
index 84269e22a5e59d8240e42fc9279f4ed1647a97fc..7ee253b6aafc62f88016417822eec21033e16372 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/HeaderElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/HeaderElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Header model object
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class HeaderElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractPlainElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/HiddenElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/HiddenElement.php
index 1c84ab42c1afad1d2a4bddf20b028bfcb5ee848c..aee2e60a94b0e27360628feb432c34810e1e3845 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/HiddenElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/HiddenElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Hidden field model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HiddenElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/ImagebuttonElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/ImagebuttonElement.php
index e5bba83fab4252011aa858fc8a3c55253a180127..30622ced59bd0217d18b41c13471d4c7473f27df 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/ImagebuttonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/ImagebuttonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Image button model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ImagebuttonElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/OptgroupElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/OptgroupElement.php
index 2b7525f0001e1a32a5bb7f679c1709c3223a329d..8fb57a00b49ddd44eed6ef75a534ac246624f7e7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/OptgroupElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/OptgroupElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Optgroup model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptgroupElement extends \TYPO3\CMS\Form\Domain\Model\Element\ContainerElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/OptionElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/OptionElement.php
index 4d100a71ca1b2156475ec80ae67e9a82811a24a4..91651c8e202870fbfb5c38adad910a32e10d99aa 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/OptionElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/OptionElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Option model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptionElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/PasswordElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/PasswordElement.php
index 801a1db5148c457723b2520d515519745af14580..67c90ff4abddb079320309b9959570863aee50e7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/PasswordElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/PasswordElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Password model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class PasswordElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
index 958752cce35cd60f4a74b6c60c295feaf62f92ab..c5bcbf9d266346b9d4c6a53c3331fd1bff9aa031 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Radio model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/RadioGroupElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/RadioGroupElement.php
index 6e30871d20c6fb7ababc3be5385745017c8804c3..e45e08acd92c25146da5a6ca75f4d67ee5affa54 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/RadioGroupElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/RadioGroupElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Radio group model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupElement extends \TYPO3\CMS\Form\Domain\Model\Element\FieldsetElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/ResetElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/ResetElement.php
index 35d8b4a51e21d7096e49fdbfd78f5da16ed13b08..bbd1dcafed9da84530c5a44731bf477e739033e1 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/ResetElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/ResetElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Reset button model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ResetElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/SelectElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/SelectElement.php
index 90f06de6186306598d51b82f44043369c8e500e7..55e6e764bbf9202a97026298c93b726394a04de7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/SelectElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/SelectElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Select model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectElement extends \TYPO3\CMS\Form\Domain\Model\Element\ContainerElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/SubmitElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/SubmitElement.php
index 3ac4abb3569e273b660bde76ada47510f98f7854..379ead996f1069e314af492fe7f730b97e34894e 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/SubmitElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/SubmitElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Submit button model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SubmitElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/TextareaElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/TextareaElement.php
index 5e2ab907c67cce4cd06facf4646fdaa8c26ff365..afa60231a9316e52955918e27fa1f74e677b43ad 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/TextareaElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/TextareaElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Textarea model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/TextblockElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/TextblockElement.php
index f3f3466f4a5de39328b863132beb79d0eb6b6884..b4816410e249934fb1948e34b5694d31d4265764 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/TextblockElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/TextblockElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Textblock model object
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class TextblockElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractPlainElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/TextlineElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/TextlineElement.php
index c209ffb613d15621f427963a69e5f1735f4cf421..e6decdf5a642ac0bb36240dd2f75c332b61c5c41 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/TextlineElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/TextlineElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Element;
  * Textline model object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Form.php b/typo3/sysext/form/Classes/Domain/Model/Form.php
index 152d5507967e1d3ed520db12ae673228cb20b096..fb866d52bda6298e7ad35580cb416278132c4c2b 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Form.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Form.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Form\Domain\Model;
  * according to the configuration.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class Form extends \TYPO3\CMS\Form\Domain\Model\Element\ContainerElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
index acf53bf03e7d8a8cab67e10dae594c3468e6f50a..8290a89de468a96f7dd1a560b1322ce77cfafe4f 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON element abstract
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/ButtonJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/ButtonJsonElement.php
index 8d770dbdf62c4522b0c600aec399026fce73919f..d8b38fc614500bcc142f6fd5e8455c200a578772 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/ButtonJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/ButtonJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON button
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ButtonJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxGroupJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxGroupJsonElement.php
index a41887c4aed7c94f99fe060f89b87ff36996c1e3..78482f8a7011a2ec2d667f532d43b5ef69767907 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxGroupJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxGroupJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON checkboxgroup
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\FieldsetJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxJsonElement.php
index 9b37d129f3b23a2b79d64229b51f730149ffde73..fe15b7b7ef5a335806dfbe54bfb53028c0a26367 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/CheckboxJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON checkbox
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/ContainerJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/ContainerJsonElement.php
index 2f1536c0a2391932367517fdc35fae23d93085b2..f0677d6bd2fd90f5fbd5d1de505825a9ae782fcc 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/ContainerJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/ContainerJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON container abstract
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/FieldsetJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/FieldsetJsonElement.php
index d7e6dd20303d1d80ae0b2a886fcb99a05c3e0672..ed24c53ae16f20aa9e2f0a4ea650151e288ea4f6 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/FieldsetJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/FieldsetJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON fieldset
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\ContainerJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/FileuploadJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/FileuploadJsonElement.php
index 87e4c37533aaace866cbe0f2aeebdbc4db8b4325..e66ca1102c201af64991421fc6e16c1592576afe 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/FileuploadJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/FileuploadJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON Fileupload
  *
  * @author Peter Beernink <p.beernink@drecomm.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/FormJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/FormJsonElement.php
index 0ae7d3a4e858b41afd203834112c9f703eda7204..fa6b8cdff069a5fde5067f979d7c1790b7871a63 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/FormJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/FormJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON form
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FormJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\ContainerJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/HeaderJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/HeaderJsonElement.php
index 0add0b0a314de008d8fe273f0626f4070e81165f..d34a8d7b2e3ee95607f8e7672ca671193d0490cb 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/HeaderJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/HeaderJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON header
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HeaderJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/HiddenJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/HiddenJsonElement.php
index 8bd6193f0f9f7dcffa6398a6ff08af7edf2e21f7..875fde70c9580e5542a65edde4193531bae0c466 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/HiddenJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/HiddenJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON hidden
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HiddenJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/NameJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/NameJsonElement.php
index 590618806b061a48a96bf0642422a6aaa3356863..f84d059dffdb8d72b4184990d908a7099fd59b86 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/NameJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/NameJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON name
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class NameJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\FieldsetJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/PasswordJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/PasswordJsonElement.php
index e0afc7bcf0e149c1d375fcd9768d39bd26e12953..738cec22965f6870e321c750d6b36081ac5ee6e8 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/PasswordJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/PasswordJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON password
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class PasswordJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/RadioGroupJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/RadioGroupJsonElement.php
index 473e392652e4ab788a9c13479517d96043a99b9e..4734b9a8426047344952c75b587a5958a1d78eeb 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/RadioGroupJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/RadioGroupJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON radiogroup
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\FieldsetJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/RadioJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/RadioJsonElement.php
index 623e2cc6c72536ba30197db6fd3e63fd5889b1af..3d16f1378a8a00288719ba4ea1a61a1d726a2115 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/RadioJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/RadioJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON radio
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/ResetJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/ResetJsonElement.php
index b7bffb081c959e12bbcb279d45003322cbe473da..a89e587241db4e21794dee6865524b42bdbd2390 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/ResetJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/ResetJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON reset
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ResetJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/SelectJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/SelectJsonElement.php
index 25a1845749367f2bb3abe65a4224e599b010af7b..ef83136625161fa0432109242431b242963a07bd 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/SelectJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/SelectJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON select
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/SubmitJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/SubmitJsonElement.php
index b9016513435caa4b4a20c71ba3b9964a04710434..b0db9c5f0928529222f3d9a28ba22f0259b2720d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/SubmitJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/SubmitJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON submit
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SubmitJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/TextareaJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/TextareaJsonElement.php
index 0ea0b26c71b8e8a366f084170444b78a119a8c06..867f266f7c0d33de5321f143524c4caca7b7d8a7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/TextareaJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/TextareaJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON textarea
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/TextblockJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/TextblockJsonElement.php
index c65ce5a41bc5eef4c0a0c64468ab508ce2b28ce9..1ef94768c97f91f55e5c4640f35cb8773566c193 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/TextblockJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/TextblockJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON textblock
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class TextblockJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/TextlineJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/TextlineJsonElement.php
index eeba8831ab188234bcdb74bbac8dc57132e0705d..f96f1b4d08dc8abd8d6d4929cc2a2ca5680ae5b0 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/TextlineJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/TextlineJsonElement.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Domain\Model\Json;
  * JSON textline
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonElement {
 
diff --git a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
index 3e25193f734d675f78ca9ad02f76d21d7f0db86a..65a17ae6a7e9288f0c8fc71a47e2ba91194b4f13 100644
--- a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
+++ b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Domain\Repository;
  * Repository for tx_form_Domain_Model_Content
  *
  * @category Repository
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class ContentRepository {
diff --git a/typo3/sysext/form/Classes/ElementCounter.php b/typo3/sysext/form/Classes/ElementCounter.php
index b8f1417f1a9ee826dad511d8d6b10ae624a4e16c..7d2eb75ec9d289b1de7ea97f326a8b2fa7d993b2 100644
--- a/typo3/sysext/form/Classes/ElementCounter.php
+++ b/typo3/sysext/form/Classes/ElementCounter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form;
  * Element counter for model
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ElementCounter implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php b/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
index c9e33646be91f7bd0c3faa1f86902131316d0f2c..ce891bd24e10a463fe0376f06053bb47ab4d22ff 100644
--- a/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
+++ b/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Alphabetic filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AlphabeticFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php b/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
index af7fe2fd0e7046273a83c6d3210ec4421837fc23..b5b45dab88b0b3b6ae7dc85d01327a22e793470a 100644
--- a/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
+++ b/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Alphanumeric filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AlphanumericFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/CurrencyFilter.php b/typo3/sysext/form/Classes/Filter/CurrencyFilter.php
index b80f8ca51afea9c378fb3ce8184fc40660b0aa4e..011bcde2f832dda85b1b39fa57847444fc0f9028 100644
--- a/typo3/sysext/form/Classes/Filter/CurrencyFilter.php
+++ b/typo3/sysext/form/Classes/Filter/CurrencyFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Currency filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CurrencyFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/DigitFilter.php b/typo3/sysext/form/Classes/Filter/DigitFilter.php
index 94024433e146a45caf69941560b9f3f1125306bf..96256c582ccb631a18d811b448fcbdcf66c3be45 100644
--- a/typo3/sysext/form/Classes/Filter/DigitFilter.php
+++ b/typo3/sysext/form/Classes/Filter/DigitFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Digit filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class DigitFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/FilterInterface.php b/typo3/sysext/form/Classes/Filter/FilterInterface.php
index 965fb5c3925b010ea3fadf03904c2e9be14b6e2b..728b517fe1a9b65536915edbd00b68365b5bbdc1 100644
--- a/typo3/sysext/form/Classes/Filter/FilterInterface.php
+++ b/typo3/sysext/form/Classes/Filter/FilterInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Interface for filters
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 interface FilterInterface
 {
diff --git a/typo3/sysext/form/Classes/Filter/IntegerFilter.php b/typo3/sysext/form/Classes/Filter/IntegerFilter.php
index a29deb58dddc4e9449c0169c4df78a859909aade..bd4885f8766ee8b1292783e78d6f762d2786e7e4 100644
--- a/typo3/sysext/form/Classes/Filter/IntegerFilter.php
+++ b/typo3/sysext/form/Classes/Filter/IntegerFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Integer filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class IntegerFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/LowerCaseFilter.php b/typo3/sysext/form/Classes/Filter/LowerCaseFilter.php
index 92db9a9f50c746b6abdb64f70ad5e13b12b90c32..c219daf39fee6df7948f800c9b59f7677870a641 100644
--- a/typo3/sysext/form/Classes/Filter/LowerCaseFilter.php
+++ b/typo3/sysext/form/Classes/Filter/LowerCaseFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Lowercase filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LowerCaseFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/RegExpFilter.php b/typo3/sysext/form/Classes/Filter/RegExpFilter.php
index ed0d6a8cd5c5cf8290c8d7f8d55b64ba3ec0bede..f35e89ade221b6c1e7ca968b3a61c2a9a0f462ef 100644
--- a/typo3/sysext/form/Classes/Filter/RegExpFilter.php
+++ b/typo3/sysext/form/Classes/Filter/RegExpFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Regular expression filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RegExpFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/RemoveXssFilter.php b/typo3/sysext/form/Classes/Filter/RemoveXssFilter.php
index fa8d2c3e6430194764c4afccccf43bf236f29d5a..ae56c3c826934c3a67ae02c65af3e11e63429bc0 100644
--- a/typo3/sysext/form/Classes/Filter/RemoveXssFilter.php
+++ b/typo3/sysext/form/Classes/Filter/RemoveXssFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Remove Cross Site Scripting filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RemoveXssFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/StripNewLinesFilter.php b/typo3/sysext/form/Classes/Filter/StripNewLinesFilter.php
index 2da737e5ae4de376acf662094beeeb8dae8725b8..e7cb141bbd95aa2321c7b09cf8f4799587c143d4 100644
--- a/typo3/sysext/form/Classes/Filter/StripNewLinesFilter.php
+++ b/typo3/sysext/form/Classes/Filter/StripNewLinesFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Strip new lines filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class StripNewLinesFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/TitleCaseFilter.php b/typo3/sysext/form/Classes/Filter/TitleCaseFilter.php
index 75496a87db811b0c65e93b046415c41a647f8805..d5acbf069084f8fece7853688697a10efa51323f 100644
--- a/typo3/sysext/form/Classes/Filter/TitleCaseFilter.php
+++ b/typo3/sysext/form/Classes/Filter/TitleCaseFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Title filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TitleCaseFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/TrimFilter.php b/typo3/sysext/form/Classes/Filter/TrimFilter.php
index 977e8565b7c1ed32020d12a3133f718018f4f244..7e584416fef98010abccc30a03be57b923e09686 100644
--- a/typo3/sysext/form/Classes/Filter/TrimFilter.php
+++ b/typo3/sysext/form/Classes/Filter/TrimFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Trim filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TrimFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Filter/UpperCaseFilter.php b/typo3/sysext/form/Classes/Filter/UpperCaseFilter.php
index b53fffe3c43bf1ed646f8119e0af7571d0e1b77b..aa8dcc744c542f7615f67a32757af2bf981d4d4d 100644
--- a/typo3/sysext/form/Classes/Filter/UpperCaseFilter.php
+++ b/typo3/sysext/form/Classes/Filter/UpperCaseFilter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Filter;
  * Uppercase filter
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class UpperCaseFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Layout.php b/typo3/sysext/form/Classes/Layout.php
index f857c3690e9436168a78dd72efd9b8e19b6ecce9..6ba01498417d3fd3bded07cd6a9b162339a2f78d 100644
--- a/typo3/sysext/form/Classes/Layout.php
+++ b/typo3/sysext/form/Classes/Layout.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form;
  * Layout class for the form elements
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class Layout implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/form/Classes/Localization.php b/typo3/sysext/form/Classes/Localization.php
index d851654bb63388785188657158636846787bb560..2b50e86d75415862dfde3bb12c733fd056d9cec4 100644
--- a/typo3/sysext/form/Classes/Localization.php
+++ b/typo3/sysext/form/Classes/Localization.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form;
  * Class to handle localizations
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class Localization {
 
diff --git a/typo3/sysext/form/Classes/PostProcess/MailPostProcessor.php b/typo3/sysext/form/Classes/PostProcess/MailPostProcessor.php
index cd75aa3d06348b7b32efdd0b4cf7763f6e1ba903..c90c8a0e916431fb400f3f25188cd94b0f4b575d 100644
--- a/typo3/sysext/form/Classes/PostProcess/MailPostProcessor.php
+++ b/typo3/sysext/form/Classes/PostProcess/MailPostProcessor.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\PostProcess;
  * The mail post processor
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MailPostProcessor implements \TYPO3\CMS\Form\PostProcess\PostProcessorInterface {
 
diff --git a/typo3/sysext/form/Classes/PostProcess/PostProcessor.php b/typo3/sysext/form/Classes/PostProcess/PostProcessor.php
index 287a69a00231dc0f18d5b508caf581ba588994e7..1277ef868b25e6392af00b673620555e087c3cea 100644
--- a/typo3/sysext/form/Classes/PostProcess/PostProcessor.php
+++ b/typo3/sysext/form/Classes/PostProcess/PostProcessor.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\PostProcess;
  * The post processor
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class PostProcessor {
 
diff --git a/typo3/sysext/form/Classes/PostProcess/PostProcessorInterface.php b/typo3/sysext/form/Classes/PostProcess/PostProcessorInterface.php
index 76de7ff1ffa998e40d42ce9d11e0e6b150ae0b73..bba8d2eabad083f95a2fa531e2eb674fc90cd6aa 100644
--- a/typo3/sysext/form/Classes/PostProcess/PostProcessorInterface.php
+++ b/typo3/sysext/form/Classes/PostProcess/PostProcessorInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\PostProcess;
  * Interface for postprocessors
  *
  * @author Franz Geiger <mail@fx-g.de>
- * @package TYPO3
- * @subpackage form
  */
 interface PostProcessorInterface
 {
diff --git a/typo3/sysext/form/Classes/Request.php b/typo3/sysext/form/Classes/Request.php
index a3c40532dea5cddb86ce36eb7124b7ba2343f5a3..fce7724c4144211c7114d0952440a547080c02b1 100644
--- a/typo3/sysext/form/Classes/Request.php
+++ b/typo3/sysext/form/Classes/Request.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form;
  * Request Handler for Form
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class Request implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/form/Classes/Utility/FilterUtility.php b/typo3/sysext/form/Classes/Utility/FilterUtility.php
index 1b9065792cc14f29228101950a08a32bc4d88d50..313fca75d37e8072cd3490f6a6eca677abb96674 100644
--- a/typo3/sysext/form/Classes/Utility/FilterUtility.php
+++ b/typo3/sysext/form/Classes/Utility/FilterUtility.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Utility;
  * Static methods for filtering
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FilterUtility implements \TYPO3\CMS\Form\Filter\FilterInterface {
 
diff --git a/typo3/sysext/form/Classes/Utility/FormUtility.php b/typo3/sysext/form/Classes/Utility/FormUtility.php
index 81b18d9f0d0c54dd8b9b3f6cd034df27dc6f519b..97e42728bdd299b458e902474eea3f74ec90bd31 100644
--- a/typo3/sysext/form/Classes/Utility/FormUtility.php
+++ b/typo3/sysext/form/Classes/Utility/FormUtility.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Form\Utility;
 /**
  * Common helper methods.
  *
- * @package TYPO3
- * @subpackage form
  * @author Oliver Hader <oliver.hader@typo3.org>
  */
 class FormUtility implements \TYPO3\CMS\Core\SingletonInterface {
diff --git a/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php b/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
index cdab1944b5e9450ccbc8620412a12dc69c06845f..ec3fcd5d02e1b59581815a59b1d6ef10ac5ad225 100644
--- a/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
+++ b/typo3/sysext/form/Classes/Utility/TypoScriptToJsonConverter.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Form\Utility;
  * Takes the incoming Typoscript and converts it to Json
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TypoScriptToJsonConverter {
 
diff --git a/typo3/sysext/form/Classes/Utility/ValidatorUtility.php b/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
index 335cc15a30c403e2ea340d0d7988872d405d4d75..a12de4078074a3d692e51d5eeaedba48d39a6ada 100644
--- a/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
+++ b/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Utility;
  * Static methods for validation
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ValidatorUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/AbstractValidator.php b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
index ded6ec453dee9414f911c7b82a96222ae45256b2..d8b1b6470305c7ef3185fd9b4533371e86173306 100644
--- a/typo3/sysext/form/Classes/Validation/AbstractValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Abstract for validation
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractValidator implements \TYPO3\CMS\Form\Validation\ValidatorInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
index 64b8ba11e10c58460152736d0b54272a27a394c3..1f02d661224d96a37bb74215e3922118d777199e 100644
--- a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Alphabetic rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AlphabeticValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
index 495c220760fc56dacd9a0afc40049cf1322c5618..086d9c0ce9b4edce486910076f55d43d89578519 100644
--- a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Alphanumeric rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AlphanumericValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/BetweenValidator.php b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
index 6b6fa5fca4da3663479cf9d2eeb2ea4faf1e0ea2..c26eafe117feb611ab8f2150347f7fe9d56cb098 100644
--- a/typo3/sysext/form/Classes/Validation/BetweenValidator.php
+++ b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Value must be between the min and max. inclusively optional
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class BetweenValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator implements \TYPO3\CMS\Form\Validation\ValidatorInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/DateValidator.php b/typo3/sysext/form/Classes/Validation/DateValidator.php
index e57fa4af2608786662284414a36bddf95c2809db..cfa768cc219a74c4a567f8d91d393441005f7dd5 100644
--- a/typo3/sysext/form/Classes/Validation/DateValidator.php
+++ b/typo3/sysext/form/Classes/Validation/DateValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Date rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class DateValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/DigitValidator.php b/typo3/sysext/form/Classes/Validation/DigitValidator.php
index 7fe5c02e501457afde1fde7f3e2baf2ea66c679b..7ec3b98f2fa6f9be5183b0ba488027e1b8a0d2ba 100644
--- a/typo3/sysext/form/Classes/Validation/DigitValidator.php
+++ b/typo3/sysext/form/Classes/Validation/DigitValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Digit rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class DigitValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/EmailValidator.php b/typo3/sysext/form/Classes/Validation/EmailValidator.php
index c1f5b361ef770e33419ce1ed88b1b49560c175d9..52b2751ad62ddac8e787128fc6589ae950f50bae 100644
--- a/typo3/sysext/form/Classes/Validation/EmailValidator.php
+++ b/typo3/sysext/form/Classes/Validation/EmailValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Email rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class EmailValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/EqualsValidator.php b/typo3/sysext/form/Classes/Validation/EqualsValidator.php
index 6d29afbe22a9e8042a8e7d850e2db0f4edf562f2..548400324ecc20563ae335d483f130511fe83a72 100644
--- a/typo3/sysext/form/Classes/Validation/EqualsValidator.php
+++ b/typo3/sysext/form/Classes/Validation/EqualsValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Equals rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class EqualsValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php b/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
index 67f56ae450568916e65b26bd416eabf21105d4b8..f006e85a878bd7dbf8bc680a157d88daa2d1419b 100644
--- a/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Validation;
  * The file type must fit one of the given mime types
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileAllowedTypesValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator implements \TYPO3\CMS\Form\Validation\ValidatorInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
index e408c4982c4ff3fb5742c0730ae0de7b0e045c2b..ee88e22bdc544c721728caf1eeb75527cbc3cb03 100644
--- a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Validation;
  * The file size must be smaller or equal than the maximum
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileMaximumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator implements \TYPO3\CMS\Form\Validation\ValidatorInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
index fec92fbefa2662c769907f4f5a7dcc940290f05d..21cd970633798e3bccc34d0099a4b4b60aaee796 100644
--- a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Validation;
  * The file size must be bigger than the minimum
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileMinimumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator implements \TYPO3\CMS\Form\Validation\ValidatorInterface {
 
diff --git a/typo3/sysext/form/Classes/Validation/FloatValidator.php b/typo3/sysext/form/Classes/Validation/FloatValidator.php
index d7c191114119ff578061797054cf3c7c9cbf9f2d..cc7f8bccb79f10162e2353f358cf831a7309a66c 100644
--- a/typo3/sysext/form/Classes/Validation/FloatValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FloatValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Float rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FloatValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php b/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
index c4044db25da72b5d4a5d6f32b01dc2b2e3b91456..38a0aab3abd28f2e43b8d4d79423beb641332353 100644
--- a/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
+++ b/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Greater than rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class GreaterThanValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/InArrayValidator.php b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
index 5859f1cdc6e98303dd2f4da267368d883c3574c1..0b5ccd742fbed4d66f9ca020d7843167eba261d8 100644
--- a/typo3/sysext/form/Classes/Validation/InArrayValidator.php
+++ b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * In array rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class InArrayValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/IntegerValidator.php b/typo3/sysext/form/Classes/Validation/IntegerValidator.php
index 87440111d79c7d27ce5aa2345731a0df061f3565..a8b43647e6f54d9312422b43e60587306b15f01e 100644
--- a/typo3/sysext/form/Classes/Validation/IntegerValidator.php
+++ b/typo3/sysext/form/Classes/Validation/IntegerValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Integer rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class IntegerValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/IpValidator.php b/typo3/sysext/form/Classes/Validation/IpValidator.php
index b5de7b4c46b478913698b3854216a070bb47d52d..80763463ab5e13493edb72d738f524ee3b71eee3 100644
--- a/typo3/sysext/form/Classes/Validation/IpValidator.php
+++ b/typo3/sysext/form/Classes/Validation/IpValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * IP address rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class IpValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/LengthValidator.php b/typo3/sysext/form/Classes/Validation/LengthValidator.php
index 1ad211f31e93c2fb3aa3821d55ac6de26c2b58b4..7bcc8b4ed68a6c6db7b99988caae210a42cdce4a 100644
--- a/typo3/sysext/form/Classes/Validation/LengthValidator.php
+++ b/typo3/sysext/form/Classes/Validation/LengthValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Length rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LengthValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/LessthanValidator.php b/typo3/sysext/form/Classes/Validation/LessthanValidator.php
index 68da5075aaa0ad5785ac0921b032409c86f08a4a..a46ff3496f9895f3d4179272eca7fccf116ed5db 100644
--- a/typo3/sysext/form/Classes/Validation/LessthanValidator.php
+++ b/typo3/sysext/form/Classes/Validation/LessthanValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Less than rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LessthanValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/RegExpValidator.php b/typo3/sysext/form/Classes/Validation/RegExpValidator.php
index 089f73b9b92b93492479f3c5f0930252c29400f1..0d6c60f76228aaf49364c5b662dc8340eadbeed1 100644
--- a/typo3/sysext/form/Classes/Validation/RegExpValidator.php
+++ b/typo3/sysext/form/Classes/Validation/RegExpValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Regexp rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RegExpValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/RequiredValidator.php b/typo3/sysext/form/Classes/Validation/RequiredValidator.php
index 348ffba0535ba27157a8190f2b6244b8e9726bb5..49cceba4a2eec93c46d2b85323880f524d6b411f 100644
--- a/typo3/sysext/form/Classes/Validation/RequiredValidator.php
+++ b/typo3/sysext/form/Classes/Validation/RequiredValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Required rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RequiredValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/UriValidator.php b/typo3/sysext/form/Classes/Validation/UriValidator.php
index 53b7caccdb56f37061cd7a1b876754d6bf71e0b3..fabbfe932c8b12d283d2fd5f133fd42a3c819d0d 100644
--- a/typo3/sysext/form/Classes/Validation/UriValidator.php
+++ b/typo3/sysext/form/Classes/Validation/UriValidator.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Uri rule
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class UriValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 
diff --git a/typo3/sysext/form/Classes/Validation/ValidatorInterface.php b/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
index 172445d74862d31350bedcf91533eebafd5f9abe..8946277d3c0517740cb16562639ec9c67c85ad72 100644
--- a/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
+++ b/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\Validation;
  * Interface for validate
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 interface ValidatorInterface
 {
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/AdditionalElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/AdditionalElementView.php
index e60fa2e02a993a3fef2f4d3ed568dd17d92510a6..f9efea16d53aada0a8f46d25fde5707f38f384ae 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/AdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/AdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Additional;
  * Additional elements for FORM object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AdditionalElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/LabelAdditionalElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/LabelAdditionalElementView.php
index 9067e7be497f0e23f09f893773409401218d7fa5..11e6bb3b1236fa80de8a2451cf72f0f95f6f13d6 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/LabelAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/LabelAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Additional;
  * View object for the label tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LabelAdditionalElementView extends \TYPO3\CMS\Form\View\Confirmation\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Additional/LegendAdditionalElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Additional/LegendAdditionalElementView.php
index 99f4fb9584ac8346ce37bbfa9649488f364c1f39..e0685041d490d9c12dfd152b5f87e8c6262113a2 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Additional/LegendAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Additional/LegendAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Additional;
  * View object for the legend tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LegendAdditionalElementView extends \TYPO3\CMS\Form\View\Confirmation\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/ConfirmationView.php b/typo3/sysext/form/Classes/View/Confirmation/ConfirmationView.php
index b53504890aeaf9a3c91c8ee664e76320eeb77e75..d9024353894ffcd8a32068fa7ec59ac748352193 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/ConfirmationView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/ConfirmationView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation;
  * Main view layer for Forms.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ConfirmationView extends \TYPO3\CMS\Form\View\Confirmation\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
index d03626d0556269897ddc479569776328def3708b..5c685c5ccf4128803cea91d8f8406f8e8e16bc5e 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * Abstract class for the form elements view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxElementView.php
index d8e9194247a3db97b3b39d1ed841be93eeab86b0..42497f791ccdeb5a26a72fb495ad36ffccd53303 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the checkbox element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxGroupElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxGroupElementView.php
index 7163d9a65fcac8948c4346db38286a3ca0bd06e0..495f25c2606dd1c705b5ea7de678adead64698e6 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/CheckboxGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the checkbox group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/ContainerElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/ContainerElementView.php
index b4ef88827b4a10d47a6af788b111998b64b705b3..35ce86b03d5d785aabafd67da46d180deb3e6da3 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/ContainerElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/ContainerElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * Abstract class for the form element containers (FORM and FIELDSET) view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/FieldsetElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/FieldsetElementView.php
index 4ead106d6f708dee150fb1f16292980806c387b7..fc5253660054c933b13913dc9d5a475d7181cd64 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/FieldsetElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/FieldsetElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the fieldset element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/FileuploadElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/FileuploadElementView.php
index fc2aedc933dbfbd32dcbf0c430ffdb5374dcee7b..0e8e383e4a85c2b0aa24d90213c28d1a86a5a405 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/FileuploadElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/FileuploadElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the upload element
  *
  * @author Rens Admiraal <r.admiraal@drecomm.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
index 4a5dc7bb207a7da14ac1d418b4aa2d48d0ca5af0..f53fa4bda34e2c4fcdc434dfc041435f0eb22dc3 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the optgroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptgroupElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/OptionElementView.php
index 3e85ee04e384c12ca692736f6c9513e663fdb0f8..03ecf78334618aa96283be9dbf90748039484cc2 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/OptionElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the option element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptionElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/RadioElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/RadioElementView.php
index 081d582d8a47f0f3703be358942a1a413dab1794..dbe8b102920a02804f44a69d98dd636e2f5ae71c 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/RadioElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/RadioElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the radio element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/RadioGroupElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/RadioGroupElementView.php
index e68d43109593aa489c4471a8a9390061c21681b7..67ce96956d55db19b314f67b4fbdfe42096404b1 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/RadioGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/RadioGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the radio group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/SelectElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/SelectElementView.php
index 68874ab7b1ecfbbd0d5d2b33ebf082724b478631..3c24c5483fe9b72525c1096860eeea349fbc8681 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/SelectElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/SelectElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the select element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/TextareaElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/TextareaElementView.php
index 87ff6b27e5f10d1b35a81f2eabc3fd9ce7325b2d..b0ddc15fc039257dfb69105e140fbe523deb44cf 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/TextareaElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/TextareaElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the text area element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/TextlineElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/TextlineElementView.php
index f970c35bdbf96aeb45ae1755f31d14dfb6b5aa67..6adb2ab2a6fbc74a50d61507b2a3bf45f12d1b27 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/TextlineElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/TextlineElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Confirmation\Element;
  * View object for the text input element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/AdditionalElementView.php b/typo3/sysext/form/Classes/View/Form/Additional/AdditionalElementView.php
index ee9d24152e9e7bc65039c642a8295d9085ca3f3f..30fdfc4c42823aba61b203f782fb16d891e3f03a 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/AdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/AdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Additional;
  * Additional elements for FORM object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AdditionalElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/ErrorAdditionalElementView.php b/typo3/sysext/form/Classes/View/Form/Additional/ErrorAdditionalElementView.php
index e6fc303c55d1e968c8dbc61d66006bd53738fc2e..32da7f40a771134206852f92a56fbcc5d621923c 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/ErrorAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/ErrorAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Additional;
  * View object for the error tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ErrorAdditionalElementView extends \TYPO3\CMS\Form\View\Form\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/LabelAdditionalElementView.php b/typo3/sysext/form/Classes/View/Form/Additional/LabelAdditionalElementView.php
index 0c93b2069bbd0a3b115eca1d2a3f62eef60a18ed..ad7d68eac415ba582d990d5039b49d5d0a6cebef 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/LabelAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/LabelAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Additional;
  * View object for the label tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LabelAdditionalElementView extends \TYPO3\CMS\Form\View\Form\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/LegendAdditionalElementView.php b/typo3/sysext/form/Classes/View/Form/Additional/LegendAdditionalElementView.php
index 213c8234fa0e64405f39ce22249c548b63c5cbcf..3ee46280a3f162606f647e482e10bf8d95b652eb 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/LegendAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/LegendAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Additional;
  * View object for the legend tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LegendAdditionalElementView extends \TYPO3\CMS\Form\View\Form\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Additional/MandatoryAdditionalElementView.php b/typo3/sysext/form/Classes/View/Form/Additional/MandatoryAdditionalElementView.php
index 0c97a456b730cb2cd0b9d69417d9f8997d6d6a27..20d84c31ae524d9d1a2acb80f9ee2dfa298d2d42 100644
--- a/typo3/sysext/form/Classes/View/Form/Additional/MandatoryAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Additional/MandatoryAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Additional;
  * View object for the mandatory tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MandatoryAdditionalElementView extends \TYPO3\CMS\Form\View\Form\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
index 6dad001dbf7b60261ee805118c87abec18f0a679..9713e41d13f0ee25a6cc9ecddcf00daba81f1421 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * Abstract class for the form elements view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/ButtonElementView.php b/typo3/sysext/form/Classes/View/Form/Element/ButtonElementView.php
index b42ba28e8a729faa3573e170ae8bad24b64b61f3..fd0340f68405ce8998faae770406f69aee00700a 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/ButtonElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/ButtonElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the button element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ButtonElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/CheckboxElementView.php b/typo3/sysext/form/Classes/View/Form/Element/CheckboxElementView.php
index a3594197017b9534440c76bb71d141bd4f91e07c..8847a11b8f1b0f4864a4bfcffe18761cb1c95d34 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/CheckboxElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/CheckboxElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the checkbox element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/CheckboxGroupElementView.php b/typo3/sysext/form/Classes/View/Form/Element/CheckboxGroupElementView.php
index 668f02fdf9e01ce7cbe1a541c61c33e9fb6c9daa..6ed097ad637515c6bcb956dcfc4fc210b8001aa7 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/CheckboxGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/CheckboxGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the checkbox group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupElementView extends \TYPO3\CMS\Form\View\Form\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/ContainerElementView.php b/typo3/sysext/form/Classes/View/Form/Element/ContainerElementView.php
index e02b5be78daef92ec09e66b119a3809146b88a2d..799cada6b61a1d90a51051fa3891158a1a0db24f 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/ContainerElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/ContainerElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * Abstract class for the form element containers (FORM and FIELDSET) view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/ContentElementView.php b/typo3/sysext/form/Classes/View/Form/Element/ContentElementView.php
index 9bbb8b9a497c24edb2097c652c70c122035b9f05..d288ce3066db6a02c1fcf0c339619b1d042c627b 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/ContentElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/ContentElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the content element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContentElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/FieldsetElementView.php b/typo3/sysext/form/Classes/View/Form/Element/FieldsetElementView.php
index fa938156a579c47e17939125b0d1ab2210437eac..9d9e028951a48971e24a352c46b26d668f857461 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/FieldsetElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/FieldsetElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the fieldset element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetElementView extends \TYPO3\CMS\Form\View\Form\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/FileuploadElementView.php b/typo3/sysext/form/Classes/View/Form/Element/FileuploadElementView.php
index c5a74f52276cc03eaeedf7205a6f332cb1c52472..81416d405b9217099001cff9b6be28630f7ac83d 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/FileuploadElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/FileuploadElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the file upload element
  *
  * @author Rens Admiraal <r.admiraal@drecomm.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/HeaderElementView.php b/typo3/sysext/form/Classes/View/Form/Element/HeaderElementView.php
index 4f0be049621fe789cf0bbf31467a9fc9a6263241..dce07ef2524858b364c0100a4aad9b6c771b11ba 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/HeaderElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/HeaderElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the text input element
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class HeaderElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/HiddenElementView.php b/typo3/sysext/form/Classes/View/Form/Element/HiddenElementView.php
index c6fadce636471bfacda1307315e3e710cbab4f11..4636427434b8515f46d2b3082debf805d3c3d9d4 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/HiddenElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/HiddenElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the hidden element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HiddenElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/ImagebuttonElementView.php b/typo3/sysext/form/Classes/View/Form/Element/ImagebuttonElementView.php
index 7d101657363fc29c61ef82ca8b0ba30eef035e72..c39b09ce5850d5d374b74da09f572498b1d4c6d1 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/ImagebuttonElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/ImagebuttonElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the image button element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ImagebuttonElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
index cd15efb33225fb9db0b9708110388236bc288cac..28ea6cc31276c3aaee82a54ee1a5764d6803404c 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the optgroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptgroupElementView extends \TYPO3\CMS\Form\View\Form\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
index 8ee70a5ea4b69bb635b730b58a7623242b14645b..5cdd15d6ae15dec44f5aa4fe15b86e32658530be 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the option element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptionElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/PasswordElementView.php b/typo3/sysext/form/Classes/View/Form/Element/PasswordElementView.php
index dd4552e12863bdcc69520ddfcd229da2240048b5..7e4aab165bdfadd29cc571c69e2115181c71582d 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/PasswordElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/PasswordElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the password element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class PasswordElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/RadioElementView.php b/typo3/sysext/form/Classes/View/Form/Element/RadioElementView.php
index ebce75413cd34f191dba4d76aa375c47ac2c7d08..d572da38e654665ff2c6a2b33430601c100d4a2c 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/RadioElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/RadioElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the radio element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/RadioGroupElementView.php b/typo3/sysext/form/Classes/View/Form/Element/RadioGroupElementView.php
index 7cdd4854db4ea109c4ca54bbb4c581fbbc25ac05..a913f35797307fb0644ec366c76e4669be38a88f 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/RadioGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/RadioGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the radio group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupElementView extends \TYPO3\CMS\Form\View\Form\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/ResetElementView.php b/typo3/sysext/form/Classes/View/Form/Element/ResetElementView.php
index d519ad5b6893acbfc5ea515ba39697fe22ecd868..0a934b7a165c1bdea274ec917f62599b67dee724 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/ResetElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/ResetElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the reset button element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ResetElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/SelectElementView.php b/typo3/sysext/form/Classes/View/Form/Element/SelectElementView.php
index c4f8c42ab5247dc67cdadcf32d30de218aa79f4b..9d2ed0aeaa29b2e396fc5d8122087d61be317945 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/SelectElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/SelectElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the select element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectElementView extends \TYPO3\CMS\Form\View\Form\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/SubmitElementView.php b/typo3/sysext/form/Classes/View/Form/Element/SubmitElementView.php
index 4475661fd835130d1cdd9d1c8cae85c5c4700ba7..360851273e7acd1d800f5ba1a13f1d5c9a10dbb2 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/SubmitElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/SubmitElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the submit button element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SubmitElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/TextareaElementView.php b/typo3/sysext/form/Classes/View/Form/Element/TextareaElementView.php
index 7c024f22dbd256a537ec36164ae63c59582f0eb8..c841ca034d7242264bccaec60247e9d698855b9d 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/TextareaElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/TextareaElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the text area element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/TextblockElementView.php b/typo3/sysext/form/Classes/View/Form/Element/TextblockElementView.php
index 245c0c693998d7891879f7f9f14b16c814bfa14c..f36972b09e9a0a476d1e5e7411a131bad5390de9 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/TextblockElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/TextblockElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the text input element
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage form
  */
 class TextblockElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/TextlineElementView.php b/typo3/sysext/form/Classes/View/Form/Element/TextlineElementView.php
index 3c8bbbf1192158da568d1c39dfed02722f77c442..07cf87d6e275fd316526acc08b20372a69e9125f 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/TextlineElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/TextlineElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form\Element;
  * View object for the text input element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Form/FormView.php b/typo3/sysext/form/Classes/View/Form/FormView.php
index 4f4562d87d98e50f04671b7bfaf3f0d007e70f94..b32ad04caffce58959a2a896b4e0554da78ec51e 100644
--- a/typo3/sysext/form/Classes/View/Form/FormView.php
+++ b/typo3/sysext/form/Classes/View/Form/FormView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Form;
  * Main view layer for Forms.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FormView extends \TYPO3\CMS\Form\View\Form\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/AdditionalElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/AdditionalElementView.php
index e5f20b96577d8b599593b75780183ec2f82bd403..f2ad4d2ac6a107b375a48463bed68e0a4e4e5b27 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/AdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/AdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Additional;
  * Additional elements for FORM object
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class AdditionalElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/LabelAdditionalElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/LabelAdditionalElementView.php
index 36dfbe5a4e51b2477372267243a912977d1ca09b..688c18ce0011e084b2f67f5c43acaa26a85a243a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/LabelAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/LabelAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Additional;
  * View object for the label tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LabelAdditionalElementView extends \TYPO3\CMS\Form\View\Mail\Html\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Additional/LegendAdditionalElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Additional/LegendAdditionalElementView.php
index b81459c9d45df5d3c6b388ac477172332470970e..e5cdb7fc3d4d1b4c5bef523d714a05283b17c0b9 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Additional/LegendAdditionalElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Additional/LegendAdditionalElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Additional;
  * View object for the legend tag
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class LegendAdditionalElementView extends \TYPO3\CMS\Form\View\Mail\Html\Additional\AdditionalElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
index 1c0328e7baf8f17f0d0158acf8b875cddc92fecb..e6ad541ca25a360910161951b438fdd58a9a8f17 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * Abstract class for the form elements view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxElementView.php
index 99b689231bda6fbfff2a02df14d2b4571b740983..9ca1c74a10a9d5afd369194eaa44e5e7cc1fd090 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the checkbox element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxGroupElementView.php
index ef266cbbe9d95bcf9a72e7569aea5c2a089c7346..0bb98f438b8f70e2cb85426b78a585da189debe6 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/CheckboxGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the checkbox group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/ContainerElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/ContainerElementView.php
index 580f2a49b98808c745db03ee580001431fc38dd0..a1f2b990d7fe532e4d2ba35b6bf341ee3ced29bf 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/ContainerElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/ContainerElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * Abstract class for the form element containers (FORM and FIELDSET) view
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/FieldsetElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/FieldsetElementView.php
index ab4a99b22c13aecb41065e68eed12d71dd2c7316..c5ba30f1f51455f673a39afb5bbc49d38113338c 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/FieldsetElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/FieldsetElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the fieldset element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/FileuploadElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/FileuploadElementView.php
index bd65aba8bdfddb5ac8aa523d207836f8ecdff19d..dbf7e4cae5d8f68dea72ea51fdc027b9c81fa19c 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/FileuploadElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/FileuploadElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the fileupload element
  *
  * @author Rens Admiraal <r.admiraal@drecomm.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/HiddenElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/HiddenElementView.php
index 7c1e9e472687bd3ff989a6d92fd28ee39a7140f8..ba869a934e14bc472cdb396bcf6625ec0bef03e8 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/HiddenElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/HiddenElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the hidden input element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HiddenElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
index 1368499e20893f89b3b177935b88f30820c1ae03..3c3289ee8966fa995436ad2a24aa23a576ec73bd 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the optgroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptgroupElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
index 3e30cdbe583144cbe3f1156aa7c3d89e823216b9..55c9d0122df2345842ce01001658415339bf8f9b 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the option element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptionElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioElementView.php
index 18a0fae237aa1deeecb644102b3be683d2520f2e..85f1ed710454946711d9f9bfd5335287559b0f75 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the radio element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioGroupElementView.php
index 319c366139ebbdf32e3e0095d42453ebbd1df073..8c6a68adf9a9096e26834eb58a1aeffe8068018d 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/RadioGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the radio group element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\FieldsetElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/SelectElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/SelectElementView.php
index 63d8ecc459f305a83a763e13fc11fc92240f0338..bf37c2a54636ffcd353b5d577f9d721a5503c571 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/SelectElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/SelectElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the select element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/TextareaElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/TextareaElementView.php
index 86fa2ab9aeff2ac025d2607324b32d68ec62aaeb..ae783c3ce070d048b2c5d3895c023e6677d26fc2 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/TextareaElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/TextareaElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the textarea element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/TextlineElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/TextlineElementView.php
index 159293c395e997e74c9d47823ec919b2d10fe160..77a40ed8fa2e5a893a0ed0c5d9e57e1ab6dfcb7e 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/TextlineElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/TextlineElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html\Element;
  * View object for the text input element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/HtmlView.php b/typo3/sysext/form/Classes/View/Mail/Html/HtmlView.php
index 5b4a9d83b35c570c5d0575afe4c8fdbd585caf33..f6632d46dbc7b0f8592709d8536ebe645e741148 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/HtmlView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/HtmlView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Html;
  * Main view layer for Forms.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HtmlView extends \TYPO3\CMS\Form\View\Mail\Html\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/MailView.php b/typo3/sysext/form/Classes/View/Mail/MailView.php
index 694a0963d1a440280a151f54cf50bac9b2fac794..0c6931f2a2946651b88d98d4e896322b6bdadaa1 100644
--- a/typo3/sysext/form/Classes/View/Mail/MailView.php
+++ b/typo3/sysext/form/Classes/View/Mail/MailView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail;
  * Main view layer for Forms.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class MailView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
index 35642fb57f016ced5979310f32dcd2dd71da1282..4b3ea08409483ca89fa52103156e3ba65b39325a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * The element abstract
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 abstract class AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
index c0720e97fc08399a5632a2e53b6655ac409735c3..a5b65d718360ef45645277178ce0410e7e8e1dbd 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the checkbox element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
index c223a5073e2fa4444e72dcc71f4f4c4431abd018..f4ffd04cf87bd67eacb772f78e4c3a9ccc02027e 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the checkboxgroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class CheckboxGroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
index e53d47885f9bb10fd3bdd43b2fbe35eb89fdc750..9c2387d85b780a5324d0d7ba2919f8902d656f24 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * Main view layer for plain mail container content.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class ContainerElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
index f0fb89b0bfb37f1cb0a81c48e0d918fe17afc94a..3a8de5a194c5f6ec4b83262b58d9d14b7cddec27 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the fieldset element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FieldsetElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
index 7842e37b937cccb769302c46d9b3dac908d4a6ab..5138cce4f193014efa3b79dec802487e29e557f8 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the fieldset element
  *
  * @author Rens Admiraal <r.admiraal@drecomm.nl>
- * @package TYPO3
- * @subpackage form
  */
 class FileuploadElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
index 8cee298c4f753b5502468a9c3604924e7182ba6a..d330277a80bca0195033441fdabed3a726aeb20b 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the hidden element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class HiddenElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
index 138e7381c630d7c72665bf3603774d80e9299f7b..09172d8d878311888d8d2ec8e18f6b7fcab7b594 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the optgroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptgroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
index 90dda15e8f96b5baac595f8bf4f566f7689126ab..7ace70dacac3a236bbfcdaec94d03f7f3fbcb882 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the option element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class OptionElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
index a8532cb32208d9c44e84297245b191cbfcd72efa..b411988a7e9d936e863dffee380da964cc2e537a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the radio element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
index b24cdea35a29e3d383ebdd585fa127f48038d4f8..5c657af95f44dd4ba5fab0076800bc02f598cba5 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the radiogroup element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class RadioGroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
index ac53b8387d78f49065cbee9b6b28a1ef6711ce0b..288ee2d89b8980e4a33b41064c99ddafa8000ce4 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the select element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class SelectElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
index 2ed158bee628d9c9cf1f77425846233fdc8b2a19..965280ff4df0246e3c3ba5e4358dfca94500b34e 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the textarea element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextareaElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
index 5d45f9cd41738a67493cf00c3cb6da288026bc16..c57c4ac353b7bfff3d9dbbbdebec4d0b9c3c72c6 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain\Element;
  * View object for the textline element
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class TextlineElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php b/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
index 34929f3b3e8d2b8c3adede85e03d67da1e865143..05e3a99e12e6994935b6ed8b95ae390059f3347b 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Mail\Plain;
  * Main view layer for plain mail content.
  *
  * @author Patrick Broens <patrick@patrickbroens.nl>
- * @package TYPO3
- * @subpackage form
  */
 class PlainView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElementView {
 
diff --git a/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php b/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
index 195779f9505e8d87f54e986bfc08f2100088962c..489b90cd59ad2c865f46353dbaf0a3bcda440aac 100644
--- a/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Wizard;
  * The form wizard load view
  *
  * @category View
- * @package TYPO3
- * @subpackage form
  * @author Oliver Hader <oliver.hader@typo3.org>
  */
 abstract class AbstractWizardView {
diff --git a/typo3/sysext/form/Classes/View/Wizard/LoadWizardView.php b/typo3/sysext/form/Classes/View/Wizard/LoadWizardView.php
index 6a0104fd2355d6ea128aa7381c8ecbf0a441e52c..423302c9d8f30aaaf25f5daf51fb50326b719d62 100644
--- a/typo3/sysext/form/Classes/View/Wizard/LoadWizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/LoadWizardView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Wizard;
  * The form wizard load view
  *
  * @category View
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class LoadWizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
diff --git a/typo3/sysext/form/Classes/View/Wizard/SaveWizardView.php b/typo3/sysext/form/Classes/View/Wizard/SaveWizardView.php
index 8a598cb4df5bf9b8e8f4baeb0c4b9925a02b34fb..fc2482fd09a580cd47ccdeebf1b2541bdcc418ce 100644
--- a/typo3/sysext/form/Classes/View/Wizard/SaveWizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/SaveWizardView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Wizard;
  * The form wizard save view
  *
  * @category View
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class SaveWizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
diff --git a/typo3/sysext/form/Classes/View/Wizard/WizardView.php b/typo3/sysext/form/Classes/View/Wizard/WizardView.php
index 08efedf6c315fa4dd999948f2db46432cced69c2..61ac71414216c29572322e2b0925e02430fe2046 100644
--- a/typo3/sysext/form/Classes/View/Wizard/WizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/WizardView.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Form\View\Wizard;
  * The form wizard view
  *
  * @category View
- * @package TYPO3
- * @subpackage form
  * @author Patrick Broens <patrick@patrickbroens.nl>
  */
 class WizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
diff --git a/typo3/sysext/form/Tests/Unit/Filter/AlphabeticFilterTest.php b/typo3/sysext/form/Tests/Unit/Filter/AlphabeticFilterTest.php
index ffbea94619e2adbf608a0eb763af3ab2562ebd9d..770583be4cdb8dfd2a4f09c7025fecbd63998ec5 100644
--- a/typo3/sysext/form/Tests/Unit/Filter/AlphabeticFilterTest.php
+++ b/typo3/sysext/form/Tests/Unit/Filter/AlphabeticFilterTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Filter;
  * Testcase for AlphabeticFilter
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class AlphabeticFilterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/form/Tests/Unit/Filter/AlphanumericFilterTest.php b/typo3/sysext/form/Tests/Unit/Filter/AlphanumericFilterTest.php
index d7165caa5f9a56a9459b2068978af42dd948ee13..5ab39719b1ac3f5c915d984133319eb9b2b1a2a3 100644
--- a/typo3/sysext/form/Tests/Unit/Filter/AlphanumericFilterTest.php
+++ b/typo3/sysext/form/Tests/Unit/Filter/AlphanumericFilterTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Filter;
  * Test case for class tx_form_System_Filter_Alphanumeric
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class AlphanumericFilterTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/form/Tests/Unit/PostProcess/PostProcessorTest.php b/typo3/sysext/form/Tests/Unit/PostProcess/PostProcessorTest.php
index d6c02017805eb0dc273de02c61a2ef913c7f125f..b2902a5d5a189aabb80058d434c2ff0f78b4c3e6 100644
--- a/typo3/sysext/form/Tests/Unit/PostProcess/PostProcessorTest.php
+++ b/typo3/sysext/form/Tests/Unit/PostProcess/PostProcessorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\PostProcess;
  * Testcase for PostProcessor
  *
  * @author Susanne Moog, <typo3@susannemoog.de>
- * @package TYPO3
- * @subpackage form
  */
 class PostProcessorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/form/Tests/Unit/Validation/AlphabeticValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/AlphabeticValidatorTest.php
index b2dba2961ef7861ee3656b8465718c951da82909..a80274a4861cb3c54bc31cfb40c6176b676d5dc4 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/AlphabeticValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/AlphabeticValidatorTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\System\Validation\AlphabeticValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class AlphabeticValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/AlphanumericValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/AlphanumericValidatorTest.php
index d77025ed974e16fd0ccccbd740e45cb465c19551..ad5f5dd4701024f9cc2659d3b89b3e66afe8b511 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/AlphanumericValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/AlphanumericValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\AlphanumericValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class AlphanumericValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/BetweenValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/BetweenValidatorTest.php
index d91b60d9163c76493bce26604c1c5f41259658b0..cd71e32f012b0d9ef50f003a6d55507b304c03f1 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/BetweenValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/BetweenValidatorTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\BetweenValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class BetweenValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/DateValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/DateValidatorTest.php
index 3eed9d7f6b5ab7cf3c626221ef86205cfaa72203..4251947d6df0fb21857782a5e0fae43f032c8a0d 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/DateValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/DateValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\DateValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class DateValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/DigitValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/DigitValidatorTest.php
index 143fa9e1231bb6604d610fbf8bc66b4744a611f6..989a0592f3af0f67c301e492809c5fa819117361 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/DigitValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/DigitValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\DigitValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class DigitValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/EmailValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/EmailValidatorTest.php
index 556d1cc934d68de345ecd4d7c1d2b9cdcc737594..fe6238a2c16fe7c7c1cbcd6412ed07b6afe761ab 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/EmailValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/EmailValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\EmailValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class EmailValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/EqualsValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/EqualsValidatorTest.php
index 8e0d85af345704204f630e65a99022dc9c02f2ca..e0259a9e091c0d8947438fb50f6ace1e75f39c7a 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/EqualsValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/EqualsValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\EqualsValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class EqualsValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/FileAllowedTypesValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/FileAllowedTypesValidatorTest.php
index 8ebc1bb38606457f08b918442c1b0d5105a9442d..2e832ca3fdfc7f0e8720bb3f22e2fab9dd234cdd 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/FileAllowedTypesValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/FileAllowedTypesValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\FileAllowedTypesValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class FileAllowedTypesValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/FileMaximumSizeValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/FileMaximumSizeValidatorTest.php
index d2666e83461a2e909ee86f89f39d5224abc13a2d..e1db626057cfb7c5fafbdd1b98d231561219a975 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/FileMaximumSizeValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/FileMaximumSizeValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\FileMaximumSizeValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class FileMaximumSizeValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/FileMinimumSizeValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/FileMinimumSizeValidatorTest.php
index 4be653db469718c20fb749991e6579ad6628a1d6..efae1be355b17a57593821304f5cf50e604ec413 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/FileMinimumSizeValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/FileMinimumSizeValidatorTest.php
@@ -27,8 +27,6 @@
  * Test case for class \TYPO3\CMS\Form\Validation\FileMinimumSizeValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class FileMinimumSizeValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/FloatValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/FloatValidatorTest.php
index c13d3174f681edd9cd6129749af7602bac629402..1578586a8b7678ab57dd3e01936b033be8c9c9cb 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/FloatValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/FloatValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\FloatValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class FloatValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/GreaterThanValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/GreaterThanValidatorTest.php
index 3df66a84abaa155292c5c5ff57379eb3a3deef8f..5faad2fbe87f0a71602321978acd256a405cb308 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/GreaterThanValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/GreaterThanValidatorTest.php
@@ -27,8 +27,6 @@
  * Test case for class \TYPO3\CMS\Form\Validation\GreaterThanValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class GreaterThanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/Helper.php b/typo3/sysext/form/Tests/Unit/Validation/Helper.php
index 22e001579f351b5f460cbf07725f9997dd469343..1b54ed19a30d7b05a3238acb0dcca9ce1fed01b4 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/Helper.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/Helper.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Small helper class to DRY the code.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class Helper extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/InArrayValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/InArrayValidatorTest.php
index f28be11dbfaa399018c58346c47c37c21fb74490..0a5968ae14f97d1d70c0e84bb405113f44358892 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/InArrayValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/InArrayValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\InArrayValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class InArrayValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/IntegerValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/IntegerValidatorTest.php
index 4acce8147d68568b4a8c3cda4b4cb32fca9c0e84..e725f437d3cddc8155fd5695f02eeef679dc5b00 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/IntegerValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/IntegerValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\IntegerValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class IntegerValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/IpValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/IpValidatorTest.php
index a837ecbd2e17c18e8a6aa4d3b48a530e69df11e8..c17d839f4750d9936b0096c5883c32c7bfcfae05 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/IpValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/IpValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\IpValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class IpValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/LengthValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/LengthValidatorTest.php
index 288b28641de574177f7dc1aa441e3fa87de48fae..506098ab048959edf0d48dfff3f52c5bb26ff713 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/LengthValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/LengthValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\LengthValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class LengthValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/LessThanValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/LessThanValidatorTest.php
index fc80f7ef829b0275b66e32b879c8ded404be520d..1ea257d7f6239d8d5e8a40599882d889da8bbd0c 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/LessThanValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/LessThanValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\LessThanValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class LessThanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/RegExpValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/RegExpValidatorTest.php
index d2e4e86e4cab3b331445d4e0797571177ade5f18..e5d87ebb27ea581d9dedeb98617bbc40daa78d08 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/RegExpValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/RegExpValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\RegExpValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class RegExpValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/RequiredValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/RequiredValidatorTest.php
index 1c72cc7a92d6396279b881e292c6c0d76a6a31ce..f45dacecccaf850ccc16325020cc86d8f2132cff 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/RequiredValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/RequiredValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\RequiredValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class RequiredValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/form/Tests/Unit/Validation/UriValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validation/UriValidatorTest.php
index 2098efbe6f9d975fa3534d27015de0dd5b243a37..fa844d69a607c86de621ef1f8004c2a47ae71c84 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/UriValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/UriValidatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Form\Tests\Unit\Validation;
  * Test case for class \TYPO3\CMS\Form\Validation\UriValidator.
  *
  * @author Andreas Lappe <a.lappe@kuehlhaus.com>
- * @package TYPO3
- * @subpackage form
  */
 class UriValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 	/**
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthtenication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthtenication.php
index f42d5508e025b720d0077b05aed473785cea8eb2..b6205a1eba56a02753f43f6db8eeb312de9442a8 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthtenication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthtenication.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Frontend\Authentication;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage tslib
  */
 class FrontendUserAuthtenication extends \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication {
 
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index b9dbed0896dd120424fd276c02467f1cab64419d..f17b1c75f54050b8e259da288e711c1d551621ca 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching;
  * Matches browserinfo, IPnumbers for use with templates
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetDataHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetDataHookInterface.php
index a308aa45ae59d77fa6ac86075220f68308f8a956..cac439d0fa4f7b9006eaeb95820155ae0bd2105d 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetDataHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetDataHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * interface for classes which hook into tslib_content and do additional getData processing
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ContentObjectGetDataHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetImageResourceHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetImageResourceHookInterface.php
index a32583bcb99a88552c9467d4ecc576b661613b74..1c71a728132c5f16d89938a72607b2958712747b 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetImageResourceHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetImageResourceHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * Interface for classes which hook into tslib_content and do additional getImgResource processing
  *
  * @author Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage cms
  */
 interface ContentObjectGetImageResourceHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetPublicUrlForFileHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetPublicUrlForFileHookInterface.php
index 710cc7b8fea6c3156c28f83a9312e81ab3b10632..f0e825736a92782b9c44d853e0d60fedf5c0910d 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetPublicUrlForFileHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetPublicUrlForFileHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * Interface for hooks to fetch the public URL of files
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ContentObjectGetPublicUrlForFileHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetSingleHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetSingleHookInterface.php
index 1f7cfd0e6b49ccead4bc2a2f954370c0404f0a5e..865089e8643d6813e466b6e456f30ac897891ad5 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetSingleHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectGetSingleHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * Interface for classes which hook into tslib_content and do additional cObjGetSingle processing
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ContentObjectGetSingleHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectPostInitHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectPostInitHookInterface.php
index 7c904182d79283b8ada82da68b742e87cf6b1198..a13f172440236e700849f252989c7b81b9f5d915 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectPostInitHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectPostInitHookInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * initialization processing.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tslib
  */
 interface ContentObjectPostInitHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index bbfa894e8e3888cff4770a233ced4002a2603743..1574a2c8c897af15bca10861315a991783614825 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * When you call your own PHP-code typically through a USER or USER_INT cObject then it is this class that instantiates the object and calls the main method. Before it does so it will set (if you are using classes) a reference to itself in the internal variable "cObj" of the object. Thus you can access all functions and data from this class by $this->cObj->... from within you classes written to be USER or USER_INT content objects.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class ContentObjectRenderer {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectStdWrapHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectStdWrapHookInterface.php
index 67c3adc6f2d564ba230ecbdabfac563707d08df6..2462a36868be92ce65c9525cc9b1c67db95bab39 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectStdWrapHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectStdWrapHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * interface for classes which hook into tslib_content and do additional stdWrap processing
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface ContentObjectStdWrapHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FileLinkHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/FileLinkHookInterface.php
index 3a6d030d67e30fda2adc3f4910b7770998c93b01..cc63dda00a1c34bfe97e617944c072e1a5283e12 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FileLinkHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FileLinkHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  * Interface for classes which hook into tslib_content and do additional getImgResource processing
  *
  * @author Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage cms
  */
 interface FileLinkHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index 98edca9e3f68436a71d80055889362135b70a7f2..0db2ae950c4514f01aca34c12a111ff027fe3db5 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -52,8 +52,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * $content.=$menu->writeMenu();
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  * @see tslib_cObj::HMENU()
  */
 class AbstractMenuContentObject {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
index c45ff011c931f99e29beafa2660fa734d0b2de4a..405e5a168a39db9c944786fef6d102442930e40c 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
@@ -30,7 +30,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * interface for classes which hook into tslib_menu
  *
  * @author Tolleiv Nietsch <nietsch@aoemedia.de>
- * @package TYPO3
  */
 interface AbstractMenuFilterPagesHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
index 2a41173387e7b8f5104a2e4b408716e541312c77..c99d23dc61cbd53ca262d9e1131640f74eef32b8 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * Extension class creating graphic based menus (PNG or GIF files)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuFoldout.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuFoldout.php
index 2ad89a0d713ac73630108a9c1394aae34e649c30..d30713912685712176a152fa6f48f7a779811cf8 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuFoldout.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuFoldout.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * Class extension tslib_gmenu for the creation of DHTML foldout menus
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class GraphicalMenuFoldout extends \TYPO3\CMS\Frontend\ContentObject\Menu\GraphicalMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuLayers.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuLayers.php
index 4656d73d061bf67a60abc49bd6f10643ec1c0e08..8fb325a3910a2674f4938a0bd2fc8c03de9dede3 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuLayers.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuLayers.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * (for BEGIN/END) and also "diff.xmenu_layers.txt"
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class GraphicalMenuLayers extends \TYPO3\CMS\Frontend\ContentObject\Menu\GraphicalMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
index 0f00ad53315dd65e1062c42e2d3c86f5b3fe5465..ed0ee6fdc7da6f3965632aa6cf53ba2962037cd3 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * ImageMap based menus
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class ImageMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
index d6ef6b1ede0b40731463a7d5438ae94c6c28c8cc..41a37a2c447068f292a05a805a1138505217a1f9 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * JavaScript/Selectorbox based menus
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class JavaScriptMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
index 3304af97fb9ff8d2755647e79f6962704a9f633d..e99d2e6e9b01a148acb65af0b27085f321d199a4 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * Extension class creating text based menus
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class TextMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuLayers.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuLayers.php
index d33af8cd071db5a60d4a4e73b55ef1af1bfaaa3f..a083681de624daee552e85cd36e83c96d48643c4 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuLayers.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuLayers.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
  * NOTICE: The contents of this class is copied EXACTLY AS IS from gmenu_layers class! See notes in class (for BEGIN/END) and also 'diff.xmenu_layers.txt'
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class TextMenuLayers extends \TYPO3\CMS\Frontend\ContentObject\Menu\TextMenuContentObject {
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/TableRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/TableRenderer.php
index c2b2c6f24dec69d62073e81db4d809e78d756651..000034c36e461353421c08291c44c2763ea05c51 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/TableRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/TableRenderer.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Frontend\ContentObject;
  *
  * @see tslib_cObj::CTABLE()
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class TableRenderer {
 
diff --git a/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php b/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
index 537ff992bcf5c44ab8d2db9fa054feabdee38beb..79b77f775dc2d92309df56a3154c647105b6725f 100644
--- a/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
@@ -28,7 +28,6 @@ namespace TYPO3\CMS\Frontend\Controller;
  * eID controller for ExtDirect
  *
  * @author Stefan Galinski <stefan.galinski@gmail.com>
- * @package 	TYPO3
  */
 class ExtDirectEidController {
 
diff --git a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
index c69a3d907da4a04d80595200b34a16ccf6636017..69bfa333939f9ae8c144d31a34826f925dd75b03 100644
--- a/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
+++ b/typo3/sysext/frontend/Classes/Controller/PageInformationController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Frontend\Controller;
  * Class for displaying page information (records, page record properties)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_cms
  */
 class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
index c1bffa2904a4b66b72099fb4d54ddf0b97cde5b0..d8fc0e608a81a56059f6cd8ed358dafa5bc2d6d4 100644
--- a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Frontend\Controller;
  * Instantiated in the bottom of this script.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class ShowImageController {
 
diff --git a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
index 14bb3fc1deabf31d53fe52dccbfa2a240a4620c5..3e89ee2abded61bddd68b17352316f75bdbae7de 100644
--- a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Frontend\Controller;
  * Class for displaying translation status of pages in the tree.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_cms
  */
 class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 5f187a24a0826687b155385f689aaece5a11a750..192f08e5ef7939198b1e36cd2e705f50df273f67 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -42,8 +42,6 @@ namespace TYPO3\CMS\Frontend\Controller;
  * Main frontend class, instantiated in the index_ts.php script as the global object TSFE
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class TypoScriptFrontendController {
 
diff --git a/typo3/sysext/frontend/Classes/Hooks/FrontendHooks.php b/typo3/sysext/frontend/Classes/Hooks/FrontendHooks.php
index 2fa120144a1fa152d4a855d0af002bacca535bbc..71924158bca97ed040783f0e4ae535b74cbe78af 100644
--- a/typo3/sysext/frontend/Classes/Hooks/FrontendHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/FrontendHooks.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Frontend\Hooks;
 /**
  * Uses frontend hooks to show preview informations
  *
- * @package TYPO3
- * @subpackage cms
  */
 class FrontendHooks {
 
diff --git a/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php b/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
index f3ab44863d16d2e308a6672ea0c1b2381c8be5eb..455df25038ecb5404c4c578d7b8c9e3ae0640656 100644
--- a/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/MediaItemHooks.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Frontend\Hooks;
 /**
  * Adds extra fields into 'media' flexform
  *
- * @package TYPO3
- * @subpackage cms
  */
 class MediaItemHooks implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
index f07961d15603a197575bfe64e05739299c633229..e28263298a1c5416cc5e59395138e851ed976025 100644
--- a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Frontend\Hooks;
  * treelist cache
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tslib
  */
 class TreelistCacheUpdateHooks {
 
diff --git a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
index ccd5967e7a139065c09416f2131d585c3dbc5ef5..447f66120304583d81214944b70576c7bfd668c2 100644
--- a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
+++ b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
@@ -53,8 +53,6 @@ namespace TYPO3\CMS\Frontend\Imaging;
  * return $gifCreator->getImageDimensions($theImage);
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class GifBuilder extends \TYPO3\CMS\Core\Imaging\GraphicalFunctions {
 
diff --git a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
index e8aa93ba770076589e86c1a4d6510f4dd397cd3f..0fef97b8833f8b460b452bddcf4099ae6e9141df 100644
--- a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
+++ b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Frontend\MediaWizard;
  * media wizard providers
  *
  * @author Ernesto Baschny <ernst@cron-it.de>
- * @package TYPO3
- * @subpackage tslib
  */
 interface MediaWizardProviderInterface
 {
diff --git a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
index 794818bcb3122be5c0ac2a8b6cab671dd38a8c1b..5bb913c8c01c4fda753e79e625db7f3cda77d641 100644
--- a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
+++ b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * Rendering of framesets
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class FramesetRenderer {
 
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index c5072f02a3b3c5d782541ab69236596bb1b34ebd..068ebdd0ef852d77b03b65e8896433035b9f813d 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -42,8 +42,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * eg: TSpagegen::pagegenInit()
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class PageGenerator {
 
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index 44adbcca9086bfdf00844cbdccafc4f5830ccb18..f609a5884816d5698b203463acda9560d5288bef 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -40,8 +40,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * It's important to set the right $where_hid_del in the object so that the functions operate properly
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see tslib_fe::fetch_the_id()
  */
 class PageRepository {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
index 4a3cfc28b1b166c10307fc408736cb632e420cf1..60428736d8ea649cfb28f3ff3be78bca6c6a5878 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * Interface for classes which hook into pageSelect and do additional getPage processing
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PageRepositoryGetPageHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
index 26272005a1306b4e8226af51a9e9695224403d5a..7443501c37dcd821709241743da69a78450068a8 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * interface for classes which hook into t3lib_pageSelect
  *
  * @author Tolleiv Nietsch <nietsch@aoemedia.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PageRepositoryGetPageOverlayHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
index 6939255fb818c53b2b31be339bcebaf514647638..0370229d8839994d54a70114006782d2ac639f44 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\Page;
  * interface for classes which hook into t3lib_pageSelect
  *
  * @author Tolleiv Nietsch <nietsch@aoemedia.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface PageRepositoryGetRecordOverlayHookInterface
 {
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index d866db5383a4ded143bb8e079c1e039bd279d4d3..27612af8416ac9a32558668aba368ca48368c5b5 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Frontend\Plugin;
  * Functions are all prefixed "pi_" which is reserved for this class. Those functions can of course be overridden in the extension classes (that is the point...)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class AbstractPlugin {
 
diff --git a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
index b2e5eebf88075d9a54ab38a399c218429f36a7e9..7a96d5f4fa8b800376e75b07de7169b1538ca272 100644
--- a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
+++ b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Frontend\Utility;
  * used only in EXT:cms/tslib/index_ts.php
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_cms
  */
 class CompressionUtility implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/frontend/Classes/Utility/EidUtility.php b/typo3/sysext/frontend/Classes/Utility/EidUtility.php
index c17b129621e45bde6c472fbc6cb588a8ba76f77a..155d863607db2cc26fd92733cbee23965d919db2 100644
--- a/typo3/sysext/frontend/Classes/Utility/EidUtility.php
+++ b/typo3/sysext/frontend/Classes/Utility/EidUtility.php
@@ -42,8 +42,6 @@ namespace TYPO3\CMS\Frontend\Utility;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tslib
  */
 class EidUtility {
 
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 334abf39f0ce9d655c01bfaff29054b92675e16a..908840b093bb43f2010d4a199c575874c7c9595e 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Frontend\View;
  * @author Jeff Segars <jeff@webempoweredchurch.org>
  * @author David Slayback <dave@webempoweredchurch.org>
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tslib
  */
 class AdminPanelView {
 
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelViewHookInterface.php b/typo3/sysext/frontend/Classes/View/AdminPanelViewHookInterface.php
index c8f3fd248326a59ed3d4285cb4baf00bf67a094c..aeba324a3eb1b80a86ad9ddb823cc2ce1fd78c76 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelViewHookInterface.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelViewHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Frontend\View;
  * Interface for classes which hook into tslib_adminpanel
  *
  * @author Georg Ringer <typo3@ringerge.org>
- * @package TYPO3
- * @subpackage cms
  */
 interface AdminPanelViewHookInterface
 {
diff --git a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index dbf2e1f3d2997cf5f6f2ec039a6b912a47f92a3a..51a4793a0e67f6b4b9ab742b9fb5b78fc235a0ec 100644
--- a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Configuration\TypoScript\ConditionMatchi
  * Testcase for class \TYPO3\CMS\Frontend\Configuration\TypoScript\ConditionMatching\ConditionMatcher.
  *
  * @author 	Oliver Hader <oliver@typo3.org>
- * @package TYPO3
- * @subpackage t3lib
  */
 class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
index 3af14d5bcad500612d3f5033585b6c229be658ed..2ee497272e53bff573d9df3207ad860e85b62ade 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Oliver Hader <oliver@typo3.org>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index 2b5bff8d79013e5be5d7c4b2ecf41124e008c90d..9ce018d8917c839fcbae0b3af3038dc7d9aa843e 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\ContentObject\Menu;
 /**
  * Testcase for TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Stefan Galinski <stefan.galinski@gmail.com>
  */
 class AbstractMenuContentObjectTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index 4fce9472f5d567ada1f4808f4e5a163551dc0f7e..7d44ad12d17f9e3af78069850066be462f2374b7 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Controller;
 /**
  * Testcase for TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index 422f0a194bfabaf76c5d6660a904edd8c74c3db7..216e14e73455cda9a081d93c6517d54414818540 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
  * Testcase for class t3lib_cacheHeash
  *
  * @author 2012 Tolleiv Nietsch <typo3@tolleiv.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
index 7a5a1b3a86e21c062ccfe508ac6083feb601f88a..c50bec4770c93b2b04a3c75a691faacdb2a67ca4 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\Page;
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Oliver Klee <typo3-coding@oliverklee.de>
- * @package TYPO3
- * @subpackage t3lib
  */
 class PageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
index 11b9713b94149b0839a10cdcd42f5ad8fb6ef2ac..2c0975bbf218ce87f9aa873cb4fd823b56253ce2 100644
--- a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Frontend\Tests\Unit\View;
 /**
  * Testcase for TYPO3\CMS\Frontend\View\AdminPanelView
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  */
 class AdminPanelViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
index 417eef24d2c2f91343f972fefe915e45951d0244..70d7ec60268f8713f631bf8b44ba8c4b2d87d5e0 100644
--- a/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
+++ b/typo3/sysext/func/Classes/Controller/PageFunctionsController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Func\Controller;
  * This class creates the framework to which other extensions can connect their sub-modules
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php b/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
index 15780906aa52d1f9d92df58d4578a787e6199171..729d66b67b8753edfd2014dc3379ee5e00d89dca 100644
--- a/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
+++ b/typo3/sysext/func_wizards/Classes/Controller/WebFunctionWizardsBaseController.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\FuncWizards\Controller;
  * Creates a framework for adding wizard sub-sub-modules under the Wizard function in Web>Info
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_funcwizardswebfunc
  */
 class WebFunctionWizardsBaseController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/impexp/classes/Clickmenu.php b/typo3/sysext/impexp/classes/Clickmenu.php
index 2392a5e00496a4cef0c4caf6c311661311be5fa4..960d3432ea2cd007c8e486f1703abda36f2c8bd9 100644
--- a/typo3/sysext/impexp/classes/Clickmenu.php
+++ b/typo3/sysext/impexp/classes/Clickmenu.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Impexp;
  * Adding Import/Export clickmenu item
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_impexp
  */
 class Clickmenu {
 
diff --git a/typo3/sysext/impexp/classes/Controller/ImportExportController.php b/typo3/sysext/impexp/classes/Controller/ImportExportController.php
index acd2653378ee8bd479284ffc0b2110a5b6063bcb..58776ca90f1274d0e3303e736b9b5caf8c6eb7e6 100644
--- a/typo3/sysext/impexp/classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/classes/Controller/ImportExportController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Impexp\Controller;
  * Main script class for the Import / Export facility
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_impexp
  */
 class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/impexp/classes/Controller/ModuleFunctionController.php b/typo3/sysext/impexp/classes/Controller/ModuleFunctionController.php
index 81fe8efe3f4a56b32f6538338ee6449471afb9ac..319bef9fb8d2fa1026afdac7385d430933b98cae 100644
--- a/typo3/sysext/impexp/classes/Controller/ModuleFunctionController.php
+++ b/typo3/sysext/impexp/classes/Controller/ModuleFunctionController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Impexp\Controller;
  * Export Preset listing for the task center
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_impexp
  */
 class ModuleFunctionController extends mod_user_task {
 
diff --git a/typo3/sysext/impexp/classes/ImportExport.php b/typo3/sysext/impexp/classes/ImportExport.php
index 3c853ea4d7313dc47241813834420922b2459b81..8cd4eb3e02f26d1b1ecf626908e4398f7e4b04b1 100644
--- a/typo3/sysext/impexp/classes/ImportExport.php
+++ b/typo3/sysext/impexp/classes/ImportExport.php
@@ -64,8 +64,6 @@ namespace TYPO3\CMS\Impexp;
  * T3D file Import/Export library (TYPO3 Record Document)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_impexp
  */
 class ImportExport {
 
diff --git a/typo3/sysext/impexp/classes/LocalPageTree.php b/typo3/sysext/impexp/classes/LocalPageTree.php
index d1e63b78d6f71db989e83f87dcedc7e58a2ef445..2cfc3a730f27b7c85c5886898c759d88deff0bd8 100644
--- a/typo3/sysext/impexp/classes/LocalPageTree.php
+++ b/typo3/sysext/impexp/classes/LocalPageTree.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Impexp;
  * Extension of the page tree class. Used to get the tree of pages to export.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_impexp
  */
 class LocalPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 
diff --git a/typo3/sysext/impexp/classes/Task/ImportExportTask.php b/typo3/sysext/impexp/classes/Task/ImportExportTask.php
index e2af857073dc592adde59c24c408b220629d2a2d..a791b4de4775c852839c23006852d7e14f38f701 100644
--- a/typo3/sysext/impexp/classes/Task/ImportExportTask.php
+++ b/typo3/sysext/impexp/classes/Task/ImportExportTask.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Impexp\Task;
  *
  * @author Kasper Skårhøj <kasper@typo3.com>
  * @author Georg Ringer <typo3@ringerge.org>
- * @package TYPO3
- * @subpackage 	impexp
  */
 class ImportExportTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
index cb7268f0d015563d12b718d61eab6999a75bf700..d77bd3e8043607732defdf25736aafd43bb20420 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
  * Indexing class for TYPO3 frontend
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
index aab394b51dd582d79f04bd31bf3994942260c745..6ca5a9403af61ee2044b2a577fca03648a8d28f6 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
  * Module extension (addition to function menu) 'Indexed search statistics' for the 'indexed_search' extension.
  *
  * @author 	Dimitri Ebert <dimitri.ebert@dkd.de>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php b/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
index cdcd35f143451b4ba0f04284d863bd2a5977da49..9a51f9d5c7e1991e4664cfb062190e1ae5061313 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
  * Backend module providing boring statistics of the index-tables.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class ModuleController {
 
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
index 2ed4db495d29f9b05fa8b20facf883b1b7306fa9..37dc5b7c300c4d00f78b46dc38d40ef32247f661 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
@@ -7,8 +7,6 @@ namespace TYPO3\CMS\IndexedSearch\Controller;
  * Creates a searchform for indexed search. Indexing must be enabled
  * for this to make sense.
  *
- * @package TYPO3
- * @subpackage tx_indexedsearch
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
diff --git a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
index fff3e6c471d37efc2ca634211543e59d0e09fa80..78ff83e371cc25e81cab9bb101b7d5501511edfd 100644
--- a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
@@ -34,8 +34,6 @@ namespace TYPO3\CMS\IndexedSearch\Example;
 /**
  * Index search crawler hook example
  *
- * @package TYPO3
- * @subpackage tx_indexedsearch
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class CrawlerHook {
diff --git a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
index 4abb0eb871d93b83e315f747e1705cd40b220821..8d296da80ce2c309b51a2cf23d96590992a2e037 100644
--- a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\IndexedSearch\Example;
  * Hooks are configured in ext_localconf.php as key => hook-reference pairs in $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks']. See example in ext_localconf.php for "indexed_search"
  * Each hook must have an entry, the key must match the hook-key in class.tx_indexed_search.php and generally the key equals the function name in the hook object (a convension used)
  *
- * @package TYPO3
- * @subpackage tx_indexedsearch
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class PluginHook {
diff --git a/typo3/sysext/indexed_search/Classes/FileContentParser.php b/typo3/sysext/indexed_search/Classes/FileContentParser.php
index f7f67db83ed0ed09f33779459cdbba32a001d3a9..efcc42b0c21c83f90a93cb5903bbcd9047c71c83 100644
--- a/typo3/sysext/indexed_search/Classes/FileContentParser.php
+++ b/typo3/sysext/indexed_search/Classes/FileContentParser.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\IndexedSearch;
  * MUST RETURN utf-8 content!
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class FileContentParser {
 
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php
index 6ec4c08da48b84815b2a299b5652eee07439819a..41541d9b447d0f5bb49a592a4fd43aea34ccff5b 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerFilesHook.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\IndexedSearch\Hook;
  * This hook is specifically used to index external files found on pages through the crawler extension.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  * @see tx_indexedsearch_indexer::extractLinks()
  */
 class CrawlerFilesHook {
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index c65bc9ccec2b4f98f4b06c33dcece035c1eab469..3dd1809a47d6063d95d7440b813a6afbe149c55a 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\IndexedSearch\Hook;
  * Crawler hook for indexed search. Works with the "crawler" extension
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class CrawlerHook {
 
diff --git a/typo3/sysext/indexed_search/Classes/Hook/MysqlFulltextIndexHook.php b/typo3/sysext/indexed_search/Classes/Hook/MysqlFulltextIndexHook.php
index e268ef68192937d9e1126c79e3162b43ec57e1ea..12076328f5ccc3526a3f8c0d67ca92f527f22b89 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/MysqlFulltextIndexHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/MysqlFulltextIndexHook.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\IndexedSearch\Hook;
  * Class that hooks into Indexed Search and replaces standard SQL queries with MySQL fulltext index queries.
  *
  * @author 	Michael Stucki <michael@typo3.org>
- * @package TYPO3
- * @subpackage tx_indexedsearch_mysql
  */
 class MysqlFulltextIndexHook {
 
diff --git a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
index 8fd4c11ad6fa399590461b7459bb8a519ec0177c..347cf9dd218b8000e44c0e9c6b260d2d989e2cc0 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\IndexedSearch\Hook;
  * Hooks for tslib_fe (TSFE).
  *
  * @author 		Oliver Hader <oliver@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_indexedsearch
  */
 class TypoScriptFrontendHook {
 
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index dcca26d595faa3da05c23b03956e2ba571c72044..c1d8c62613c3f6819be4f1f39e9b02e7da9061dd 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\IndexedSearch;
  * Indexing class for TYPO3 frontend
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class Indexer {
 
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index db4bd184df6629752c74a275bfe567ad4ea9de1f..0c55acd66c2101fa953a2c6f107ba7a732493c8c 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\IndexedSearch;
  * A lexer splits the text into words
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class Lexer {
 
diff --git a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
index a2d880348170a68009726b3cf48445c4ba600da1..96b604ae01eaec72f102ef940bfb629625e2613e 100644
--- a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
+++ b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\IndexedSearch\Utility;
  * This class is final because it contains only static methods.
  *
  * @author Dmitry Dulepov <dmitry@typo3.com>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class IndexedSearchUtility {
 
diff --git a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
index dd1294c2b2129bd98f2857999bdd8a726f2d535f..71aef1e050d2bbc8d4c1f575e2160d0eb69e8439 100644
--- a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
+++ b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\IndexedSearch\Tests\Unit;
  *
  * @author Dmitry Dulepov <dmitry.dulepov@gmail.com>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tx_indexedsearch
  */
 class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/info/Classes/Controller/InfoModuleController.php b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
index 37162cd32823d99038b79350c61edf92f4af73e3..ad074e871e71d2e0b517e3631c79d809a5c90532 100644
--- a/typo3/sysext/info/Classes/Controller/InfoModuleController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Info\Controller;
  * This class creates the framework to which other extensions can connect their sub-modules
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class InfoModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
index 4a91f73a91f297eeea7055ee2c67511a5ffd32e4..bbbcf349591d23324bc733b0113b2b27d0dda6ec 100644
--- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\InfoPagetsconfig\Controller;
  * Page TSconfig viewer
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_infopagetsconfig
  */
 class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/install/Classes/CheckTheDatabaseHookInterface.php b/typo3/sysext/install/Classes/CheckTheDatabaseHookInterface.php
index b5dac40599889a4a40079fdbedab7bfc18936c44..9ce837d4de06dabc264ad7c00e260f979a932f39 100644
--- a/typo3/sysext/install/Classes/CheckTheDatabaseHookInterface.php
+++ b/typo3/sysext/install/Classes/CheckTheDatabaseHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Install;
  * Interface for hook in tx_install::checkTheDatabase
  *
  * @author Thomas Maroschik <tmaroschik@dfau.de>
- * @package TYPO3
- * @subpackage install
  */
 interface CheckTheDatabaseHookInterface
 {
diff --git a/typo3/sysext/install/Classes/Controller/InstallToolModuleController.php b/typo3/sysext/install/Classes/Controller/InstallToolModuleController.php
index 8c9f5b53d51b25a6b568cceebe1090a205d18016..930ea320468e0a4867fd92db2d6e6a5e89706247 100644
--- a/typo3/sysext/install/Classes/Controller/InstallToolModuleController.php
+++ b/typo3/sysext/install/Classes/Controller/InstallToolModuleController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Install\Controller;
  * Install Tool, if it's accessed by an authenticated Backend user.
  *
  * @author Steffen Gebert <steffen.gebert@typo3.org>
- * @package TYPO3
- * @subpackage install
  */
 class InstallToolModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/install/Classes/CoreUpdates/LocalConfigurationUpdate.php b/typo3/sysext/install/Classes/CoreUpdates/LocalConfigurationUpdate.php
index 30ca06b7590d12fc6dd693739539c95e4c5a797b..8404998221251fcff71f33b5528f71725882f8d9 100644
--- a/typo3/sysext/install/Classes/CoreUpdates/LocalConfigurationUpdate.php
+++ b/typo3/sysext/install/Classes/CoreUpdates/LocalConfigurationUpdate.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Install\CoreUpdates;
 /**
  * Move localconf.php to LocalConfiguration.php
  *
- * @package TYPO3
- * @subpackage install
  * @author Helge Funk <helge.funk@e-net.info>
  */
 class LocalConfigurationUpdate extends \TYPO3\CMS\Install\Updates\AbstractUpdate {
diff --git a/typo3/sysext/install/Classes/InstallBootstrap.php b/typo3/sysext/install/Classes/InstallBootstrap.php
index 52180a78e313f3e5dbd1f6c2c9ea0411159ceda9..c657b59c5f9c090e1476ea4359354815ca6b9b0e 100644
--- a/typo3/sysext/install/Classes/InstallBootstrap.php
+++ b/typo3/sysext/install/Classes/InstallBootstrap.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Install;
  * Encapsulate install tool specific bootstrap methods.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage core
  */
 class InstallBootstrap {
 
diff --git a/typo3/sysext/install/Classes/Installer.php b/typo3/sysext/install/Classes/Installer.php
index 76b984ccfd0cf768d36dc1e9aca5e458a18abb0d..5c203504f546375dfb45b2dfd12172e6daeba4f9 100644
--- a/typo3/sysext/install/Classes/Installer.php
+++ b/typo3/sysext/install/Classes/Installer.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Install;
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author 	Ingmar Schlecht <ingmar@typo3.org>
- * @package TYPO3
- * @subpackage tx_install
  */
 class Installer {
 
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index 71b01b0d3bc82291efbc0520cf820f922f4c4cd9..209ad58122ffab120a3c902feb568050f758fd12 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Install\Report;
  * Provides an installation status report
  *
  * @author 		Ingo Renner <ingo@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_install
  */
 class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
diff --git a/typo3/sysext/install/Classes/Session.php b/typo3/sysext/install/Classes/Session.php
index 64fc610bac41a557af6ad06b2888e1974425f731..ee0fa06d29c108461d80e70b331750083352ec8b 100644
--- a/typo3/sysext/install/Classes/Session.php
+++ b/typo3/sysext/install/Classes/Session.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Install;
  * Secure session handling for the install tool.
  *
  * @author Ernesto Baschny <ernst@cron-it.de>
- * @package TYPO3
- * @subpackage tx_install
  */
 class Session {
 
diff --git a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
index 44da01b35dd20d58d5785e5e3e38354d11ddc468..6542d7ac59a63ec558f842813bb97cc4c7176513 100644
--- a/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
+++ b/typo3/sysext/install/Classes/Sql/SchemaMigrator.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Install\Sql;
  * compare wizard and extension manager.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage t3lib
  */
 class SchemaMigrator {
 
diff --git a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
index 95a07cbcf39f74f4b89a7286bae87cb415fbb685..03d7f82d8c7442c46c50e4aec87b52ec8d106f87 100644
--- a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
@@ -30,7 +30,6 @@ namespace TYPO3\CMS\Install\Updates;
  * b) relative filemounts (base = 1) which aren't related to a storage
  * further we assume that all other filemounts (base > 1) are already related to a storage
  *
- * @package 	 TYPO3
  * @author 	  Tolleiv Nietsch <typo3@tolleiv.de>
  * @license 	 http://www.gnu.org/copyleft/gpl.html
  */
diff --git a/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php b/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
index 7ea92f6c8834ce6883e0ee7f153b46bdb0f96af5..bed067791041ecf072159aaac26afb00a87b6532 100644
--- a/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
@@ -27,7 +27,6 @@ namespace TYPO3\CMS\Install\Updates;
  * Upgrade wizard which creates all sys_file* tables. Required to ensure that all
  * other FAL migration wizards can run properly.
  *
- * @package TYPO3
  * @author Tolleiv Nietsch <info@tolleiv.de>
  * @license http://www.gnu.org/copyleft/gpl.html
  */
diff --git a/typo3/sysext/install/Classes/Updates/InstallerProcessInterface.php b/typo3/sysext/install/Classes/Updates/InstallerProcessInterface.php
index c92aa85957c358b7a327bc50ab95dc0cdbfcdd4d..56622d8452db6d639dfbe11662c68085b3fd3125 100644
--- a/typo3/sysext/install/Classes/Updates/InstallerProcessInterface.php
+++ b/typo3/sysext/install/Classes/Updates/InstallerProcessInterface.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Install\Updates;
  * on initializing a new TYPO3 instance.
  *
  * @author Oliver Hader <oliver.hader@typo3.org>
- * @package TYPO3
- * @subpackage install
  */
 interface InstallerProcessInterface {
 
diff --git a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
index 4704bef9eae61fec73c12245d0dff2a221a97631..cc1cd3a9f57aacfd529e9dac040caafc4187afc8 100644
--- a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
@@ -27,7 +27,6 @@ namespace TYPO3\CMS\Install\Updates;
  * Upgrade wizard which goes through all files referenced in the tt_content.image filed
  * and creates sys_file records as well as sys_file_reference records for the individual usages.
  *
- * @package TYPO3
  * @author Ingmar Schlecht <ingmar@typo3.org>
  * @license http://www.gnu.org/copyleft/gpl.html
  */
diff --git a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
index 833a0f21440096bab782b625c052c593a3f3e451..e66d3978f51c430b04307a1c2870cd759651412b 100644
--- a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
@@ -27,7 +27,6 @@ namespace TYPO3\CMS\Install\Updates;
  * Upgrade wizard which goes through all files referenced in the tt_content.media filed
  * and creates sys_file records as well as sys_file_reference records for the individual usages.
  *
- * @package TYPO3
  * @author Steffen Ritter <steffen.ritter@typo3.org>
  * @license http://www.gnu.org/copyleft/gpl.html
  */
diff --git a/typo3/sysext/install/Tests/Unit/InstallToolTest.php b/typo3/sysext/install/Tests/Unit/InstallToolTest.php
index 1b7def318fb443a34f7228771c7e54664278db8e..92f4e34ae7e74508380a87d56b971e2420f87b2a 100644
--- a/typo3/sysext/install/Tests/Unit/InstallToolTest.php
+++ b/typo3/sysext/install/Tests/Unit/InstallToolTest.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Install\Tests\Unit;
 /**
  * Testcase for class "tx_install"
  *
- * @package TYPO3
- * @subpackage tx_install
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  */
 class InstallToolTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/lang/Classes/ClearLanguageCacheMenuItem.php b/typo3/sysext/lang/Classes/ClearLanguageCacheMenuItem.php
index b3f4984c6e0fdb7c95d9865e1f84e875cdf05a40..c280c4a40908ce46bee7d6f07415d81e1f541caa 100644
--- a/typo3/sysext/lang/Classes/ClearLanguageCacheMenuItem.php
+++ b/typo3/sysext/lang/Classes/ClearLanguageCacheMenuItem.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Lang;
  * Extending class to render the menu for the cache clearing actions, and adding Clear lang/l10n cache option
  *
  * @author Dominique Feyer <dominique.feyer@reelpeek.net>
- * @package TYPO3
- * @subpackage tx_Lang
  */
 class ClearLanguageCacheMenuItem implements \TYPO3\CMS\Backend\Toolbar\ClearCacheActionsHookInterface {
 
diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php
index cb07cde065d4d4ce2b61f42333751be7828ac68b..fcc18106c05fe55392c1b1c588671d9db983eebf 100644
--- a/typo3/sysext/lang/Classes/Controller/LanguageController.php
+++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Lang\Controller;
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package lang
- * @subpackage LanguageController
  */
 class LanguageController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Extension.php b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
index 7c1ccbf9148439604c4c1784008d2841e2b19c32..ee44b1198a403dbbbaaab5a08d13145eabc3b0f2 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Lang\Domain\Model;
  * Extension model
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Language.php b/typo3/sysext/lang/Classes/Domain/Model/Language.php
index 6e9755358764f205766e5a473a59f77562e5e819..1b9d165c62a482724cec6cfcfe9b9b04ee48fe0b 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Language.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Language.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Domain\Model;
  * Language model
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class Language extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php b/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
index 15457c642b9bbd836a42a9107b418d1dd59ce02e..310b6c1580e66d9348e3e46be00c429e9e94d676 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/LanguageSelectionForm.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Domain\Model;
  * Model to contain all information from the form changing the selection of available languages
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class LanguageSelectionForm extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/UpdateTranslationForm.php b/typo3/sysext/lang/Classes/Domain/Model/UpdateTranslationForm.php
index b9a0e71b543f5b5e735d15e5a0468d2a2f55fb37..e9eeb2f2b42ad7800e9ad69c84858d1bca58f6ff 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/UpdateTranslationForm.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/UpdateTranslationForm.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Domain\Model;
  * Model to contain all information from the form requesting to update translations
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class UpdateTranslationForm extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
diff --git a/typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php
index c400c94e1a3b2c5f3849066e34dc26ea2eb8a27c..df3c55773b4ec26da9303e409e6d4b3ee2425a4e 100644
--- a/typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/lang/Classes/Domain/Repository/ExtensionRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Domain\Repository;
  * Extension repository
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class ExtensionRepository {
 	/**
diff --git a/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php b/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
index 4f774ff5409daef0e42f0d0a3a2707e0b59e2fba..c8cce9f1f350f29fa4381ba1ee804af035b7753f 100644
--- a/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
+++ b/typo3/sysext/lang/Classes/Domain/Repository/LanguageRepository.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Domain\Repository;
  * Language repository
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package lang
- * @subpackage LanguageRepository
  */
 class LanguageRepository {
 
diff --git a/typo3/sysext/lang/Classes/Exception/Lang.php b/typo3/sysext/lang/Classes/Exception/Lang.php
index 644a87e8b8e9dbf648717653e14a470099901fb2..f2b7924b2a22b94dc215c08e7890a9c06de79f84 100644
--- a/typo3/sysext/lang/Classes/Exception/Lang.php
+++ b/typo3/sysext/lang/Classes/Exception/Lang.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Exception;
  * An exception when something is wrong within the lang
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class Lang extends \TYPO3\CMS\Core\Exception {
 
diff --git a/typo3/sysext/lang/Classes/Exception/Ter.php b/typo3/sysext/lang/Classes/Exception/Ter.php
index 8c5ef972266f41f33cf4b9bb96cb679a653040c3..54d93f494d1bb0954bec3fa2a638f2028a22688d 100644
--- a/typo3/sysext/lang/Classes/Exception/Ter.php
+++ b/typo3/sysext/lang/Classes/Exception/Ter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Exception;
  * An exception when something is wrong within the lang
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class Ter extends \TYPO3\CMS\Core\Exception {
 
diff --git a/typo3/sysext/lang/Classes/Exception/XmlParser.php b/typo3/sysext/lang/Classes/Exception/XmlParser.php
index 7e98f2e7601e928fb3deb42103889f96976949bb..424b7f629fcc9793d3577ea74e20343687d74be3 100644
--- a/typo3/sysext/lang/Classes/Exception/XmlParser.php
+++ b/typo3/sysext/lang/Classes/Exception/XmlParser.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Exception;
  * An exception when something is wrong within parsing the xml
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class XmlParser extends \TYPO3\CMS\Core\Exception {
 }
diff --git a/typo3/sysext/lang/Classes/LanguageCacheClearer.php b/typo3/sysext/lang/Classes/LanguageCacheClearer.php
index a12980d227bebd074907c4fea4c125433fd9b29a..891a375fdf1de55bdd1039b9aa214ef49e01b08f 100644
--- a/typo3/sysext/lang/Classes/LanguageCacheClearer.php
+++ b/typo3/sysext/lang/Classes/LanguageCacheClearer.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Lang;
  * Class to clear temp files of htmlArea RTE
  *
  * @author Dominique Feyer <dominique.feyer@reelpeek.net>
- * @package TYPO3
- * @subpackage tx_Lang
  */
 class LanguageCacheClearer {
 
diff --git a/typo3/sysext/lang/Classes/LanguageService.php b/typo3/sysext/lang/Classes/LanguageService.php
index 16dcd350eca7443c47a4e3579eb189462ffb8cb5..179c84561796f640448b2a518ba24c483526ee15 100644
--- a/typo3/sysext/lang/Classes/LanguageService.php
+++ b/typo3/sysext/lang/Classes/LanguageService.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Lang;
  * It's only available in the backend and under certain circumstances in the frontend
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @see typo3/template.php, template
  */
 class LanguageService {
diff --git a/typo3/sysext/lang/Classes/Utility/Connection/Ter.php b/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
index a4dbc353e5eb1638e0117e7b6ecedf6419ca36b8..607fc6805bc8249bcc8e6ac17f783e670533fd86 100644
--- a/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
+++ b/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lang\Utility\Connection;
  * Extends of extensionmanager ter connection to enrich with translation related methods
  *
  * @author Sebastian Fischer <typo3@evoweb.de>
- * @package TYPO3
- * @subpackage lang
  */
 class Ter extends \TYPO3\CMS\Extensionmanager\Utility\Connection\TerUtility {
 
diff --git a/typo3/sysext/lang/Classes/View/Language/CheckTranslationJson.php b/typo3/sysext/lang/Classes/View/Language/CheckTranslationJson.php
index 9cc9a69797ffcaaf24691b3e3e76ed65ba806f36..1f4bfb38ceb372baa34f3c198bcd1540dcb16817 100644
--- a/typo3/sysext/lang/Classes/View/Language/CheckTranslationJson.php
+++ b/typo3/sysext/lang/Classes/View/Language/CheckTranslationJson.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Lang\View\Language;
  * JSON view for "checkTranslation" action in "Language" controller
  *
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package lang
- * @subpackage View
  */
 class CheckTranslationJson extends \TYPO3\CMS\Extbase\Mvc\View\AbstractView {
 
diff --git a/typo3/sysext/lang/Classes/View/Language/UpdateTranslationJson.php b/typo3/sysext/lang/Classes/View/Language/UpdateTranslationJson.php
index 0448a38d5edeb399275b3361cc9ed194addf36af..691502aa4d2f57645ec3abbd111100f640178d43 100644
--- a/typo3/sysext/lang/Classes/View/Language/UpdateTranslationJson.php
+++ b/typo3/sysext/lang/Classes/View/Language/UpdateTranslationJson.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Lang\View\Language;
  * JSON view for "updateTranslation" action in "Language" controller
  *
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package lang
- * @subpackage View
  */
 class UpdateTranslationJson extends CheckTranslationJson {
 
diff --git a/typo3/sysext/lang/Classes/ViewHelpers/Be/FormEngineBasedCheckboxGroupViewHelper.php b/typo3/sysext/lang/Classes/ViewHelpers/Be/FormEngineBasedCheckboxGroupViewHelper.php
index 572b090103b04cb1da360137160ebc7c3c2dbf68..54b7befa1f231df6bff6e135a50ae79afbe8fc7c 100644
--- a/typo3/sysext/lang/Classes/ViewHelpers/Be/FormEngineBasedCheckboxGroupViewHelper.php
+++ b/typo3/sysext/lang/Classes/ViewHelpers/Be/FormEngineBasedCheckboxGroupViewHelper.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lang\ViewHelpers\Be;
  * <myext:be.formEngineBasedCheckboxGroup name="paymentOptions" options="{options}" optionValueField="id" optionLabelField="firstName" />
  *
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package lang
- * @subpackage ViewHelpers
  */
 class FormEngineBasedCheckboxGroupViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\SelectViewHelper {
 
diff --git a/typo3/sysext/lang/Classes/ViewHelpers/Be/SpriteIconViewHelper.php b/typo3/sysext/lang/Classes/ViewHelpers/Be/SpriteIconViewHelper.php
index 1c7d66f7b345e1473fb5b2f41285e75eddb5ff95..4e7f53574c052e92446e171eb90ae185505daf94 100644
--- a/typo3/sysext/lang/Classes/ViewHelpers/Be/SpriteIconViewHelper.php
+++ b/typo3/sysext/lang/Classes/ViewHelpers/Be/SpriteIconViewHelper.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Lang\ViewHelpers\Be;
  * <myext:be.spriteIcon icon="actions-document-close" title="Close" class="myClass" />
  *
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package lang
- * @subpackage ViewHelpers
  */
 class SpriteIconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
index c01c0928e82219bda68bdfc3fd0a013617d87403..d75e96498a6be81bbc04cbeb476120ab11f0516f 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
  * Testcase for Extension
  *
  * @author Wouter Wolters <typo3@wouterwolters.nl>
- * @package TYPO3
- * @subpackage lang
  */
 class ExtensionTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageSelectionFormTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageSelectionFormTest.php
index 49ccaa5cd8a85f93fddbddd332c3db9e8caba69e..75c10927c4de0afe1392480fd1d1402a8c5139f2 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageSelectionFormTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageSelectionFormTest.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
  * Testcase LanguageSelectionForm
  *
  * @author Wouter Wolters <typo3@wouterwolters.nl>
- * @package TYPO3
- * @subpackage lang
  */
 class LanguageSelectionFormTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
index 5c27e56851d9bbbdd5567952b9ea07b9d8a8f9b5..f46836d5ac62a2185a1c7ca374880e8b62fe0813 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/LanguageTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
  * Testcase for Language
  *
  * @author Wouter Wolters <typo3@wouterwolters.nl>
- * @package TYPO3
- * @subpackage lang
  */
 class LanguageTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/lang/Tests/Unit/Domain/Model/UpdateTranslationFormTest.php b/typo3/sysext/lang/Tests/Unit/Domain/Model/UpdateTranslationFormTest.php
index 6dc2292ffebce0cc4abc0df82be32b26b7404962..a2d7d5b2a4900561316e9c84730248a260452f95 100644
--- a/typo3/sysext/lang/Tests/Unit/Domain/Model/UpdateTranslationFormTest.php
+++ b/typo3/sysext/lang/Tests/Unit/Domain/Model/UpdateTranslationFormTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Lang\Tests\Unit\Domain\Model;
  * Testcase for UpdateTranslationForm
  *
  * @author Wouter Wolters <typo3@wouterwolters.nl>
- * @package TYPO3
- * @subpackage lang
  */
 class UpdateTranslationFormTest extends \TYPO3\CMS\Extbase\Tests\Unit\BaseTestCase {
 
diff --git a/typo3/sysext/lowlevel/Classes/AdminCommand.php b/typo3/sysext/lowlevel/Classes/AdminCommand.php
index 025f9ba64de88ba7e81fed0649f8ae2bcfba2f26..b1ed22f8f19d8ce6d7013916c8ecd9865d93e5ee 100644
--- a/typo3/sysext/lowlevel/Classes/AdminCommand.php
+++ b/typo3/sysext/lowlevel/Classes/AdminCommand.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Core functions for administration
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class AdminCommand extends \TYPO3\CMS\Core\Controller\CommandLineController {
 
diff --git a/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php b/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
index b46de6fcbbaa701afe0069bf6c96e6733e2b1b84..b6573ee8bb4c0198d59f91602b6096659914b8cb 100644
--- a/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * cleanflexform
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class CleanFlexformCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/CleanerCommand.php b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
index fcad7140e94c4b79a3dabf1e4bf6c1223a3a8162..9c5db60a6525c9e23d4c29e63cd1b1f85baf8cf2 100644
--- a/typo3/sysext/lowlevel/Classes/CleanerCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Core functions for cleaning and analysing
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class CleanerCommand extends \TYPO3\CMS\Core\Controller\CommandLineController {
 
diff --git a/typo3/sysext/lowlevel/Classes/DeletedRecordsCommand.php b/typo3/sysext/lowlevel/Classes/DeletedRecordsCommand.php
index ab4a239f0f6488c37c599e511f79cc7e17304cc6..2862df61bc2a70b61859efd380c7d79b3f27f129 100644
--- a/typo3/sysext/lowlevel/Classes/DeletedRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/DeletedRecordsCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for Deleted records
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class DeletedRecordsCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php b/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
index ce448dac4b82bdf76d03bba412aa4f366070ef3c..2be56101de92f99e15fbb0a201af19a371d61c91 100644
--- a/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for double files
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class DoubleFilesCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/LostFilesCommand.php b/typo3/sysext/lowlevel/Classes/LostFilesCommand.php
index 928d1be0671f7d11cee47c52ca28396ad3ad4ce6..571f544ce78f2b1e5acc1c073322fa356c52b14d 100644
--- a/typo3/sysext/lowlevel/Classes/LostFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/LostFilesCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for Lost files
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class LostFilesCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php b/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
index 632cfb1283717112e0f8b1c9b9e32e21f3d49c5c..e57a36c53bf222c67dfaa012d1f6caccea2315f0 100644
--- a/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for missing files.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class MissingFilesCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php b/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
index 8161e34b49ccbf0b95e1a3844fb2ebed6d4b3cad..6dd3b1bae5068aa71b746fa5db99768825041152 100644
--- a/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for missing relations.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class MissingRelationsCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/OrphanRecordsCommand.php b/typo3/sysext/lowlevel/Classes/OrphanRecordsCommand.php
index 25e5b349c2833e65e6883361380ee9d03cedc428..92ce8e79a6f693eca49997fcb0071e9475895cf3 100644
--- a/typo3/sysext/lowlevel/Classes/OrphanRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/OrphanRecordsCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for Orphan Records
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class OrphanRecordsCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/RteImagesCommand.php b/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
index ac898082f6392dd526083acc6efad50a26790a4a..2cf649c89f839e30702dba9811edde28c670c852 100644
--- a/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/RteImagesCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for RTE images integrity
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class RteImagesCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/SyslogCommand.php b/typo3/sysext/lowlevel/Classes/SyslogCommand.php
index 1030604d3a9bb0dc115312ba5ca13fb501c4d173..3a70acbdee2ca229148459b4c77e4eea218acf90 100644
--- a/typo3/sysext/lowlevel/Classes/SyslogCommand.php
+++ b/typo3/sysext/lowlevel/Classes/SyslogCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * syslog
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class SyslogCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
index f032b631b2a3ab3b768b0528333da3c0099d7a51..59a1cfcac5068522b927317098b0c7b75dee6c7f 100644
--- a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
+++ b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Lowlevel\Utility;
  * See the extension 'lowlevel' /config (Backend module 'Tools > Configuration')
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage t3lib
  * @see SC_mod_tools_config_index::main()
  */
 class ArrayBrowser {
diff --git a/typo3/sysext/lowlevel/Classes/VersionsCommand.php b/typo3/sysext/lowlevel/Classes/VersionsCommand.php
index 68f4024efe43569e42239aec7d0f38116caacf4a..39a2ee99337df95b1bd115bf88f3d037da50131b 100644
--- a/typo3/sysext/lowlevel/Classes/VersionsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/VersionsCommand.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Lowlevel;
  * Looking for versions of records
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class VersionsCommand extends CleanerCommand {
 
diff --git a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
index 74385bcd70e9cca8832ed2c59205986c33923351..4a799d0cb37ce00e8bd58c9c45420780a3e3a06d 100644
--- a/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
+++ b/typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Lowlevel\View;
  * Script class for the Config module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class ConfigurationView {
 
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index 35ed3f41882a616039eda0b08a0957a68422f9a8..f183ba8918732bde419409ac75fbb568d2e4a6ab 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Lowlevel\View;
  * Script class for the DB int module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_lowlevel
  */
 class DatabaseIntegrityView {
 
diff --git a/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php b/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
index 301981e43ca96488ceab6e509986ae86f621450a..174534ab400bca3bc5ba9c486065bafe93b2714f 100644
--- a/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
+++ b/typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Lowlevel\Tests\Unit\Utility;
 /**
  * Testcase for the \TYPO3\CMS\Lowlevel\Utility\ArrayBrowser class in the TYPO3 Core.
  *
- * @package TYPO3
- * @subpackage t3lib
  * @author Oliver Klee <typo3-coding@oliverklee.de>
  */
 class ArrayBrowserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
index b5adf50522754123c6bdb04c54e97d9f15b24ef1..171482885c17a10188a95a4081d6ba3ef0f7ec5f 100644
--- a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
+++ b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Opendocs\Controller;
  *
  * @author Benjamin Mack <benni@typo3.org>
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage opendocs
  */
 class OpendocsController implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInterface {
 
diff --git a/typo3/sysext/openid/Classes/OpenidService.php b/typo3/sysext/openid/Classes/OpenidService.php
index 8662992441cfb67f93bd5cbad7ebf14101437812..4f7e865c849f7cffb9aed6c68bce57edbad9c947 100644
--- a/typo3/sysext/openid/Classes/OpenidService.php
+++ b/typo3/sysext/openid/Classes/OpenidService.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Openid;
  * Service "OpenID Authentication" for the "openid" extension.
  *
  * @author 	Dmitry Dulepov <dmitry@typo3.org>
- * @package 	TYPO3
- * @subpackage 	tx_openid
  */
 class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
 
diff --git a/typo3/sysext/openid/Classes/OpenidStore.php b/typo3/sysext/openid/Classes/OpenidStore.php
index aa4dc4359f24b73f6c6d9217d166182a66b7bcaa..3927fa3c70e680b326387aa5ac6251a49b981b1e 100644
--- a/typo3/sysext/openid/Classes/OpenidStore.php
+++ b/typo3/sysext/openid/Classes/OpenidStore.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Openid;
  * This class is a TYPO3-specific OpenID store.
  *
  * @author Dmitry Dulepov <dmitry.dulepov@gmail.com>
- * @package TYPO3
- * @subpackage tx_openid
  */
 class OpenidStore extends \Auth_OpenID_OpenIDStore {
 
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
index 325d063de02b91519b50db43fab100ea49d81805..92eec72ff44ee472d0ec5554e3d983a7a0265342 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
@@ -7,8 +7,6 @@ namespace TYPO3\CMS\Perm\Controller;
  * (user and group)) via new TYPO3AJAX facility
  *
  * @author Andreas Kundoch <typo3@mehrwert.de>
- * @package TYPO3
- * @subpackage core
  * @license GPL
  * @since TYPO3_4-2
  */
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
index 912b4f734e84f3a9ceeddbe15fbfb4d5c74eefe0..5b0c0d5121c9336263287475dbfcacceb02f0313 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
@@ -12,8 +12,6 @@ namespace TYPO3\CMS\Perm\Controller;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Andreas Kundoch <typo3@mehrwert.de>
- * @package TYPO3
- * @subpackage core
  */
 class PermissionModuleController {
 
diff --git a/typo3/sysext/perm/mod1/perm.js b/typo3/sysext/perm/mod1/perm.js
index 9a90804fac59b6a7cd4a4c2a101c55d1366f104e..64bdc3fa8eeb4225958b61c5d4b70a4f36325bd7 100644
--- a/typo3/sysext/perm/mod1/perm.js
+++ b/typo3/sysext/perm/mod1/perm.js
@@ -31,8 +31,6 @@
 /**
  * @author		Andreas Kundoch <typo3@mehrwert.de>
  * @author		Benjamin Mack <www.xnos.org>
- * @package		TYPO3
- * @subpackage	core
  */
 
 // TYPO3 code extracted from index.php
diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index 8df3b54a2f962836446e3a37659a0cfba5905249..7d4a5d8ea3614d6bddbb6bde43670788f8755589 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Recordlist\Browser;
  * class for the Element Browser window.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ElementBrowser {
 
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
index d31e61efacd205c516a1ac5e70e3c551fb31e9e4..47f41106035aa6c1dd663b611cc6a8efae638ec0 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Recordlist\Controller;
  * Script class for the Element Browser window.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ElementBrowserController {
 
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
index f085e291b9e5a52222ff2178b6a23b55cf0b3f07..bd8f5690f8f8af207cc9ffa2b8d10c47804e63e0 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Recordlist\Controller;
  * Script Class, putting the frameset together.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ElementBrowserFramesetController {
 
diff --git a/typo3/sysext/recordlist/Classes/RecordList.php b/typo3/sysext/recordlist/Classes/RecordList.php
index 84f43fa211a70c38f52e8ad1b6dff5e7580013ad..2a1820873a544a2c8f5223fb40161e359617358a 100644
--- a/typo3/sysext/recordlist/Classes/RecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Recordlist;
  * Script Class for the Web > List module; rendering the listing of records on a page
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class RecordList {
 
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 43d6fdb2f4075876d7b0a3c729db111e68fd5a91..027163e229562b6a584eb59e1000a147cd15836e 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Recordlist\RecordList;
  * Shared between Web>List (db_list.php) and Web>Page (sysext/cms/layout/db_layout.php)
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  * @see localRecordList
  */
 class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index 92ab0566fc33d359d5409a70a878f451f2ad69b8..f00911fd91eeef1a946ae2fc329021d3b2af5974 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Recordlist\RecordList;
  * Class for rendering of Web>List module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class DatabaseRecordList extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList {
 
diff --git a/typo3/sysext/recordlist/Classes/RecordList/RecordListHookInterface.php b/typo3/sysext/recordlist/Classes/RecordList/RecordListHookInterface.php
index 1d0742f2e2d8439aa27a376dd6ea23e2dc2a15e5..b200718fc0ec4a9a33772185c641a0040519215a 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/RecordListHookInterface.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/RecordListHookInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Recordlist\RecordList;
  * Interface for classes which hook into localRecordList and modify clip-icons
  *
  * @author Bernhard Kraft <kraftb@kraftb.at>
- * @package TYPO3
- * @subpackage t3lib
  */
 interface RecordListHookInterface
 {
diff --git a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
index 9b4ef4fd2ffda1f8dd08e59c739833626c839a3f..31b8f21f4f67215933ca34b945a7bf9df5372933 100644
--- a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
+++ b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Recycler\Controller;
  *
  * @author Erik Frister <erik_frister@otq-solutions.com>
  * @author Julian Kleinhans <typo3@kj187.de>
- * @package TYPO3
- * @subpackage tx_recycler
  */
 class DeletedRecordsController {
 
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
index 64cdf8ef16b37f46839e909d475bd72ee2a87433..b41adf76740f1ee905ca8eadf7ce4226c43ca6c6 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Recycler\Controller;
  *
  * @author 		Julian Kleinhans <typo3@kj187.de>
  * @author 	Erik Frister <erik_frister@otq-solutions.com>
- * @package 		TYPO3
- * @subpackage 	tx_recycler
  */
 class RecyclerAjaxController {
 
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index 0f9b2d45fe335e8f72b3234040c5206dba7a3e46..40934bdac7e8a76d65db6024b783538933721978 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Recycler\Controller;
  * Module 'Recycler' for the 'recycler' extension.
  *
  * @author 	Julian Kleinhans <typo3@kj187.de>
- * @package 	TYPO3
- * @subpackage 	tx_recycler
  */
 class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index 9ab6d42ae1ee2d31717a769851201713aaa67ab0..6dd31156f5beb7782d4f31d18913fc2b2a283af3 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Recycler\Domain\Model;
  * Model class for the 'recycler' extension.
  *
  * @author 	Julian Kleinhans <typo3@kj187.de>
- * @package 	TYPO3
- * @subpackage 	tx_recycler
  */
 class DeletedRecords {
 
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
index efb40e116faac6983bfcd87b16749e802352ce81..962682585d88f3f12b296c802d494b666eaac7dc 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Recycler\Domain\Model;
  * Model class for the 'recycler' extension.
  *
  * @author 	Julian Kleinhans <typo3@kj187.de>
- * @package 	TYPO3
- * @subpackage 	tx_recycler
  */
 class Tables {
 
diff --git a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
index 1a427d67947c4287a1387aeab1d1d38b60b06200..8ab89a4829843195d856225f691923e9bc87aa86 100644
--- a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
+++ b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Recycler\Utility;
  * Helper class for the 'recycler' extension.
  *
  * @author 	Julian Kleinhans <typo3@kj187.de>
- * @package 	TYPO3
- * @subpackage 	tx_recycler
  */
 class RecyclerUtility {
 
diff --git a/typo3/sysext/recycler/res/js/t3_recycler.js b/typo3/sysext/recycler/res/js/t3_recycler.js
index d8c26f037b78d117c67a2e70e935838351bc2138..7784c39341eceb074e1b1c4d20c3d306c1c8ad57 100644
--- a/typo3/sysext/recycler/res/js/t3_recycler.js
+++ b/typo3/sysext/recycler/res/js/t3_recycler.js
@@ -28,8 +28,6 @@
  * @author	Julian Kleinhans <typo3@kj187.de>
  * @author  Erik Frister <erik_frister@otq-solutions.com>
  * @author  Steffen Kamper <steffen@typo3.org>
- * @package	TYPO3
- * @subpackage	tx_recycler
  */
 
 Ext.ns('Recycler');
diff --git a/typo3/sysext/reports/Classes/Controller/ReportController.php b/typo3/sysext/reports/Classes/Controller/ReportController.php
index f5ad0d179ec882553997b9ba7949c9d0a025d767..c06f387f56c9b63770170c2760b4a32759094279 100644
--- a/typo3/sysext/reports/Classes/Controller/ReportController.php
+++ b/typo3/sysext/reports/Classes/Controller/ReportController.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Reports\Controller;
 /**
  * Reports controller
  *
- * @package TYPO3
- * @subpackage tx_reports
  */
 class ReportController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 07b3fd02c1963fd7b450fe920805bd4c3501b675..f048a64d0f3ec8dec72239266b6578901c462172 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * Performs some checks about the install tool protection status
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackag reports
  */
 class ConfigurationStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
index e4b5d71b3b08d63ae91fe52663618f0cf08101db..bc3bc1ccdbf8f4f939ff432985e604f881782370 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * Performs several checks about the system's health
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class SecurityStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index 6c3044912c78ae06dd0693137b8866a6c45ef84e..df37f7306b2250fb2b20eb805c7756aca6d7899d 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * The status report
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class Status implements \TYPO3\CMS\Reports\ReportInterface {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php b/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
index 2ead429e4f98527d41b606284e4c19597fa82879..19887cfa8fd4513f7fd95e77dd717df6ab24a0ab 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SystemStatus.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * Performs several checks about the system's health
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class SystemStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php b/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
index 13ee1a9311a521ee545263bd81f393c4f44bc397..92a16eb9f383744121b67326897534c55e2168bc 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Typo3Status.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * Performs basic checks about the TYPO3 install
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class Typo3Status implements \TYPO3\CMS\Reports\StatusProviderInterface {
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
index 92130a7052b458fda660bef500b7b350cb8240e6..203a75eeddac8fdabd73bc0c4590e246c17fb789 100644
--- a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
+++ b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Report\Status;
  * Post processes the warning messages found in about modules.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class WarningMessagePostProcessor {
 
diff --git a/typo3/sysext/reports/Classes/ReportInterface.php b/typo3/sysext/reports/Classes/ReportInterface.php
index f27a3279dd6a422715463218680a4e5ba3c74b6c..49ff1207000db4d1d10e251e46dee873e2f1eaac 100644
--- a/typo3/sysext/reports/Classes/ReportInterface.php
+++ b/typo3/sysext/reports/Classes/ReportInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Reports;
  * Interface for classes which provide a report.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tx_reports
  */
 interface ReportInterface
 {
diff --git a/typo3/sysext/reports/Classes/Status.php b/typo3/sysext/reports/Classes/Status.php
index ddf9e93cd9349a703ed2c3a0d1e6388ccdd0f6d1..a8f8fdf7c473b28ac23cb23e6cfd72450f9f8237 100644
--- a/typo3/sysext/reports/Classes/Status.php
+++ b/typo3/sysext/reports/Classes/Status.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports;
  * A class representing a certain status
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class Status {
 
diff --git a/typo3/sysext/reports/Classes/StatusProviderInterface.php b/typo3/sysext/reports/Classes/StatusProviderInterface.php
index b04e4a0dadcd09db0a57f272207524f41ee9bfd0..b3232ffc021910c4b59a85c7737747ddb36ba119 100644
--- a/typo3/sysext/reports/Classes/StatusProviderInterface.php
+++ b/typo3/sysext/reports/Classes/StatusProviderInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Reports;
  * Interface for classes which provide a status report entry.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tx_reports
  */
 interface StatusProviderInterface
 {
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
index e74b33460fb96c0f1df54243988e6e215abfd782..c805f3d309ffbf376d6a8114e10bbcc5d8f8287f 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Reports\Task;
  * A task that should be run regularly to determine the system's status.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class SystemStatusUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
index 3d80c55b7b72f714ffcab1ea7e445307774dc15a..e0400f7130f8c81daf27469042a65b8f5d1efc53 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Reports\Task;
  * issue notifications.
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage reports
  */
 class SystemStatusUpdateTaskNotificationEmailField implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/reports/Classes/ViewHelpers/ActionMenuItemViewHelper.php b/typo3/sysext/reports/Classes/ViewHelpers/ActionMenuItemViewHelper.php
index e9e3bc30af32eea9c312f737c0aaa9493b0de373..43f6e3ff56700ef08d4790697c9ef04ec8d49652 100644
--- a/typo3/sysext/reports/Classes/ViewHelpers/ActionMenuItemViewHelper.php
+++ b/typo3/sysext/reports/Classes/ViewHelpers/ActionMenuItemViewHelper.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Reports\ViewHelpers;
 /**
  * Render an item of the menu
  *
- * @package TYPO3
- * @subpackage tx_reports
  */
 class ActionMenuItemViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper {
 
diff --git a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
index b57ab4ac5b67d587a0a4f09ed52bc26b762c64e0..4a5e142794dc3d03fe795c96cdea654fe9c244ab 100644
--- a/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
+++ b/typo3/sysext/reports/Classes/ViewHelpers/IconViewHelper.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Reports\ViewHelpers;
 /**
  * Render the icon of a report
  *
- * @package TYPO3
- * @subpackage tx_reports
  */
 class IconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper {
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/AbstractBackend.php b/typo3/sysext/rsaauth/Classes/Backend/AbstractBackend.php
index e96764331d04bc62169c2fbcd883158e984526ae..c6c87b341d0dc9543d6014bd7145c5d42511a709 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/AbstractBackend.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/AbstractBackend.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Rsaauth\Backend;
  * successfully, the result is a string. Otherwise it is NULL.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 abstract class AbstractBackend {
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php b/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
index 2262a6bbedab113c5f4c8a18d5bbcb11da6ffb76..4563e98fb3a21e1ac3add7c0bb078354bbe6853a 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Rsaauth\Backend;
  * This class contains a factory for the RSA backends.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class BackendFactory {
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php b/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
index eae90cfc73ae575b0e73a79fbd23f89884b990b0..e03efac1613fa8f26bde0ed6d22b86f5221fe4aa 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Rsaauth\Backend;
  * tx_rsaauth_abstract_backend for the information on using backends.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class CommandLineBackend extends \TYPO3\CMS\Rsaauth\Backend\AbstractBackend {
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php b/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
index 5c5b002b8e76f254cfbdeb7364a4e91298a793c3..c1a0d087f36b93360e2c391f40dd710033dd590f 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Rsaauth\Backend;
  * backends.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class PhpBackend extends \TYPO3\CMS\Rsaauth\Backend\AbstractBackend {
 
diff --git a/typo3/sysext/rsaauth/Classes/BackendWarnings.php b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
index 3a835d507b510d219aa87aa015ecab0af28c6f07..0aa4be0f53e3dd029ccbae5489e413a5d62a8abb 100644
--- a/typo3/sysext/rsaauth/Classes/BackendWarnings.php
+++ b/typo3/sysext/rsaauth/Classes/BackendWarnings.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth;
  * RSA configuration and create a warning if the configuration is wrong.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class BackendWarnings {
 
diff --git a/typo3/sysext/rsaauth/Classes/Hook/FrontendLoginHook.php b/typo3/sysext/rsaauth/Classes/Hook/FrontendLoginHook.php
index 943d82356bbc60c4c1ab91c4bf972159dbd8f2d9..a9b4b94c3eac96fbc8957da64c3affecb1b0bede 100644
--- a/typo3/sysext/rsaauth/Classes/Hook/FrontendLoginHook.php
+++ b/typo3/sysext/rsaauth/Classes/Hook/FrontendLoginHook.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth\Hook;
  * Frontend. Warning: felogin must be USER_INT for this to work!
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class FrontendLoginHook {
 
diff --git a/typo3/sysext/rsaauth/Classes/Hook/LoginFormHook.php b/typo3/sysext/rsaauth/Classes/Hook/LoginFormHook.php
index a179706b71f796bc0bf4647930a04c1836d075da..c3d3187aedbe8580367f06d78a09e32d5ac715f6 100644
--- a/typo3/sysext/rsaauth/Classes/Hook/LoginFormHook.php
+++ b/typo3/sysext/rsaauth/Classes/Hook/LoginFormHook.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth\Hook;
  * and supply a proper form tag.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class LoginFormHook {
 
diff --git a/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php b/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
index ab26cc9f3ba07a08eaa3ac3ac2c7075d8f5c7d74..a78b261d6efd6925a81a7b4d1278960d580a9c55 100644
--- a/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
+++ b/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth\Hook;
  * and supply a proper form tag.
  *
  * @author Helmut Hummel <helmut.hummel@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class UserSetupHook {
 
diff --git a/typo3/sysext/rsaauth/Classes/Keypair.php b/typo3/sysext/rsaauth/Classes/Keypair.php
index 57ea87e36c616984adc7ee60545054046761d619..e974717be735ac19add5478fa6c179b78fde7c81 100644
--- a/typo3/sysext/rsaauth/Classes/Keypair.php
+++ b/typo3/sysext/rsaauth/Classes/Keypair.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth;
  * and trasnfer these keys between other PHP classes.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class Keypair {
 
diff --git a/typo3/sysext/rsaauth/Classes/RsaAuthService.php b/typo3/sysext/rsaauth/Classes/RsaAuthService.php
index 9d430a63df0474b7a10b2657086cabacfde537fc..c7aabc325161e1f4c9adf5296a5758afa1fe3941 100644
--- a/typo3/sysext/rsaauth/Classes/RsaAuthService.php
+++ b/typo3/sysext/rsaauth/Classes/RsaAuthService.php
@@ -10,8 +10,6 @@ namespace TYPO3\CMS\Rsaauth;
  * always works, even if other TYPO3 internals change.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class RsaAuthService extends \TYPO3\CMS\Sv\AuthenticationService {
 
diff --git a/typo3/sysext/rsaauth/Classes/Storage/AbstractStorage.php b/typo3/sysext/rsaauth/Classes/Storage/AbstractStorage.php
index 757709137522ad4a3727a6c6a4526744800b3b89..5d0be004531ce6497d1df1361d5ab3ab13592338 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/AbstractStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/AbstractStorage.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Rsaauth\Storage;
  * This class contains the abstract storage for the RSA private keys
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 abstract class AbstractStorage {
 
diff --git a/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php b/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
index 5f7fc1f3c63f2d6c8a150815749b9aa31ded8d2a..c343912105bd17a0ad9eeb4068e6eba6a7bd95d3 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/SessionStorage.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Rsaauth\Storage;
  * use "split" storage for keys.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class SessionStorage extends \TYPO3\CMS\Rsaauth\Storage\AbstractStorage {
 
diff --git a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
index 5384e35e49982c675aef2eeddbf5d28580cc76e9..e3f3a2853a5a8381f509d34260869448105cf0d8 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Rsaauth\Storage;
  * in the database, part in the database.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class SplitStorage extends \TYPO3\CMS\Rsaauth\Storage\AbstractStorage {
 
diff --git a/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php b/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
index 045d79e32e689437886ebdbbc62dac2620542e79..748e610789a8242327ac85e7aca136d92a5370bf 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/StorageFactory.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Rsaauth\Storage;
  * This class contains a factory for the RSA backends.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_rsaauth
  */
 class StorageFactory {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
index 94b34d405d8920f594498ee97aea1b8f9058b41b..8b74f5a8f9593b98c7ae211160ecb721335dd719 100644
--- a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
+++ b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * Script class for the Element Browser window.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index 4cf32913c24118213a1d77695dc036f53d9163cf..ff7e92439655de714a7e636adc3d417fe66cc4dc 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Rtehtmlarea\Controller;
  * Script class for the Element Browser window.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class BrowseLinksController {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
index 420924bc3e78f7fb53dd935e72ef05c8d90cbfea..36daeb769fae77e5c5ad457c268b74749b84c8f6 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Rtehtmlarea\Controller;
  * Script class for the Element Browser window.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class SelectImageController {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/FolderTree.php b/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
index eba7020f36aac1f6c383143f55841c47e18f86b0..82f950c22b85b844b8388b9218eb7d1c33aed4b9 100644
--- a/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * Used directly by the RTE.
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class FolderTree extends \rteFolderTree {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php b/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php
index ac6686f0d97d73534dfde995448e0b7e753093b1..068651b0055e2499e5a22f94589c20a8a214b617 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * Local Folder Tree
  *
  * @author 	Kasper Skårhøj <kasper@typo3.com>
- * @package TYPO3
- * @subpackage tx_rte
  */
 class ImageFolderTree extends \TBE_FolderTree {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/PageTree.php b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
index 937469f99402f417d542e39eb3d5dab7d4dcae1f..b4eec764e5c336806e96a1bbda30fe59bfa05a30 100644
--- a/typo3/sysext/rtehtmlarea/Classes/PageTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
@@ -41,8 +41,6 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * Class which generates the page tree
  *
  * @author 	Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class PageTree extends \rtePageTree {
 
diff --git a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
index 09b43453a76a0faf59dfb16537c138c39435d4ea..640ee07477bbab033611bf7fd0c2dc9c26be9c02 100644
--- a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * Script Class
  *
  * @author 	Kasper Skårhøj <kasper@typo3.com>
- * @package TYPO3
- * @subpackage tx_rte
  */
 class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Autoloader.php b/typo3/sysext/saltedpasswords/Classes/Autoloader.php
index f8fdc832a624874b8a2df2c66c4570fc9ae35b0d..8161a835b1ab08ef73306063b314ef1297e2606c 100644
--- a/typo3/sysext/saltedpasswords/Classes/Autoloader.php
+++ b/typo3/sysext/saltedpasswords/Classes/Autoloader.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Saltedpasswords;
  * Autoloader included from Install Tool that lets saltedpasswords load itself
  *
  * @author Helmut Hummel <helmut.hummel@typo3.org>
- * @package TYPO3
- * @subpackage saltedpasswords
  */
 class Autoloader {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Evaluation/BackendEvaluator.php b/typo3/sysext/saltedpasswords/Classes/Evaluation/BackendEvaluator.php
index 3ee128baaa7e95bd8f663c9de7f434ad1884bb74..8ac5918bc5d9f8a73447f2ec10a21d7fbdf3357a 100644
--- a/typo3/sysext/saltedpasswords/Classes/Evaluation/BackendEvaluator.php
+++ b/typo3/sysext/saltedpasswords/Classes/Evaluation/BackendEvaluator.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Saltedpasswords\Evaluation;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-06-14
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class BackendEvaluator extends \TYPO3\CMS\Saltedpasswords\Evaluation\Evaluator {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php b/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
index acdf6611b343a117c32482636a8090203e961a39..f7dc8674fdcf710748473beafd30c20bba08b40f 100644
--- a/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
+++ b/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Saltedpasswords\Evaluation;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-06-14
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class Evaluator {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Evaluation/FrontendEvaluator.php b/typo3/sysext/saltedpasswords/Classes/Evaluation/FrontendEvaluator.php
index a18eeb711fe2dafd27d99e5ecccb7ed9e510b36a..3f7e246707c4b3622dfd982a995586f5b615360d 100644
--- a/typo3/sysext/saltedpasswords/Classes/Evaluation/FrontendEvaluator.php
+++ b/typo3/sysext/saltedpasswords/Classes/Evaluation/FrontendEvaluator.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Saltedpasswords\Evaluation;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-06-14
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class FrontendEvaluator extends \TYPO3\CMS\Saltedpasswords\Evaluation\Evaluator {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
index 5fad4780540a95fa7f0eb56dc5fdcac22703738c..3c99c1227971e27e07fb158181912d764516f031 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 abstract class AbstractSalt {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
index 392b9c913b48959bb36a145d1a0dabe73f438ef7..6b3a5c1ad47572790cbcee0893395197e16b66a8 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
index dc53d233a2ac0e5c3a6584aa99d45ed31890ce69..0295dbeb264aed857ada8d21bb4399f2b94a650b 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
@@ -39,8 +39,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
index 3ba45b4c52d0049c054a7f09a04c30e5be1a6cef..f89cdb3902846db91fdb4fea9b530710b1422aa9 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
@@ -44,8 +44,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \TYPO3\CMS\Saltedpasswords\Salt\SaltInterface {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
index ff6d358a9dcd73fcfbf031dfd8ff389c646db713..d94a78bb014cc76f75070a476a7551f1ce1a6dbe 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class SaltFactory {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php b/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
index fb9b3b0b9174a6c1dccd4ce1074d6b5774154ccb..ee0b06101e2fc69cce10afabaae525bf5daa0004 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
@@ -38,8 +38,6 @@ namespace TYPO3\CMS\Saltedpasswords\Salt;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 interface SaltInterface
 {
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 11b3430e14d42a991dab764027a19cfe0baeba9c..deac206afdcf3087352b06e2ee1f539ab72e40cd 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -36,8 +36,6 @@ namespace TYPO3\CMS\Saltedpasswords;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-06-14
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
index 972be9aa6fa9ba1ad1fc5e859c7242aa901787c4..cacc490b0d80feb6829183f6b9973fd947d92f7b 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Saltedpasswords\Task;
  * Additional field for salted passwords bulk update task
  *
  * @autor Philipp Gampe <typo3@philippgampe.info>
- * @package TYPO3
- * @subpackage saltedpasswords
  */
 class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index 5d0221b4b8b366d38044515778d6765a60612593..11605a1259688f85687446993e8b7dd39dc61d2a 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Saltedpasswords\Task;
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  * @author Marcus Krause <marcus#exp2010@t3sec.info>
- * @package TYPO3
- * @subpackage saltedpasswords
  */
 class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
index 25c677c1bdbe8359027dd229bfe2faadd8ff9f86..a2fac86aa01f0a7b9e4c3739f00dd81dfba289c1 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
@@ -6,8 +6,6 @@ namespace TYPO3\CMS\Saltedpasswords\Utility;
  *
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-09-04
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class ExtensionManagerConfigurationUtility {
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
index 5da6c364ba70e966e77103e8216c682e59fa1ffb..75f01e85cbef0b9dbb9f827cdeec73dc0d973cf9 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Saltedpasswords\Utility;
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @author Steffen Ritter <info@rs-websystems.de>
  * @since 2009-06-14
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class SaltedPasswordsUtility {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
index 53eab1c829276f0d4dc3cdf09c25fd32a0e3da16..1dc56d8a45a356230ac4e3dfc611e304d9360eb1 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Evaluation;
  * Testcase for SaltedPasswordsUtility
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class EvaluatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index 1a278c5c844194434e238ebed92f2ee99853b376..6a67cb0172ce9bdf22adb8ba36cd82f82df2ee59 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Salt;
  * Testcase for BlowfishSalt
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class BlowfishSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
index abe1cc5ff4126a909f5a765882ca36db2fb85471..b499b5f2186d4b1e4a15a46e986eee1faf48ecba 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Salt;
  * Testcases for Md5Salt
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class Md5SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
index 3531579a95af146f30bfdf4d34518f90270f2352..342014491a464dcdd7d361955cdcd4037f6054d7 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Salt;
  * Testcase for PhpassSalt
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class PhpassSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
index 48f066ae6610f740ebe8da9fa0387e9520dfd320..47e4dcee48bca235dfb712f24cc0c145a005e183 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/SaltFactoryTest.php
@@ -32,8 +32,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Salt;
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
  * @since 2009-09-06
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class SaltFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
index 0c019d69e3e4576196c5645a329c6ae62a298ddc..b6b50fe2db38363aed10ec1ed0ec91e3ddd16af2 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Utility/SaltedPasswordsUtilityTest.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Saltedpasswords\Tests\Unit\Utility;
  * Testcase for SaltedPasswordsUtility
  *
  * @author Marcus Krause <marcus#exp2009@t3sec.info>
- * @package TYPO3
- * @subpackage tx_saltedpasswords
  */
 class SaltedPasswordsUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
index e4c2b0ee776b8655b9cc6c15fe91f0e9646a024f..94d45ac94c0877e8073b828e19edc40726de4d05 100644
--- a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler;
  * Interface for classes who want to provide additional fields when adding a task
  *
  * @author 		Ingo Renner <ingo@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 interface AdditionalFieldProviderInterface
 {
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 3cbe29d561b4a2430181b9d39984a63627280b15..ae3ba1d12738d45b48b3ceb583c562e7f47f7673 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Scheduler\Controller;
  * @author 		François Suter <francois@typo3.org>
  * @author 		Christian Jul Jensen <julle@typo3.org>
  * @author 		Ingo Renner <ingo@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
index e31c696f4ab496b59963dfc811e6bebaeebfe46b..48b2be611cb552093309b517b92f8f9236b5c760 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Scheduler\CronCommand;
  *
  * @author Markus Friedrich <markus.friedrich@dkd.de>
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tx_scheduler
  */
 class CronCommand {
 
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
index c899dda60b1bba155fda9d17e534e3f70471f990..381ed4fce59176f725bb1526e19b5206504e8553 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Scheduler\CronCommand;
  * '2-4 10-40/10 * mar * fri'  will be nolmalized to '2,4 10,20,30,40 * * 3 1,2'
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage scheduler
  */
 class NormalizeCommand {
 
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTask.php b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
index 9d851479581f9eef455387854cb323ba8a759561..c6c1d7b78d414c51e5d8b222d3de2cae95d63155 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Scheduler\Example;
  * This is useful for testing parallel executions
  *
  * @author 		François Suter <francois@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class SleepTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
index a618e2851a2a3220faa1112d763c463d195825c3..a66d12688f57618f63d3b79ffcb34afe76776950 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Example;
  * Aditional fields provider class for usage with the Scheduler's sleep task
  *
  * @author 		François Suter <francois@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class SleepTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index d7e80c00fb91a4a784ed60699f3d4c4a090888d3..ad86ded5e6a2adacacff58211ae0fae5c171ce59 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Example;
  * Class "tx_scheduler_TestTask" provides testing procedures
  *
  * @author 		Markus Friedrich <markus.friedrich@dkd.de>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
index 90addee144a4833f185b3fa29bf1b641d72a5a99..a6b89692244e5fb2062c55ef84b44b58c3701666 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Example;
  * Aditional fields provider class for usage with the Scheduler's test task
  *
  * @author 		François Suter <francois@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class TestTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 1e0985e891f0bddc980dcdfe28fcd717052d308f..5ebd4489220824922438414914f6de14332c0c6f 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\Scheduler;
  * @author 	François Suter <francois@typo3.org>
  * @author 	Christian Jul Jensen <julle@typo3.org>
  * @author 	Markus Friedrich <markus.friedrich@dkd.de>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class Execution {
 
diff --git a/typo3/sysext/scheduler/Classes/FailedExecutionException.php b/typo3/sysext/scheduler/Classes/FailedExecutionException.php
index d0f0dd4e1af29b2702ce9b088cf9ed9c022118df..6e4d3dc19d671e2ccf29878b7b577c36c4006364 100644
--- a/typo3/sysext/scheduler/Classes/FailedExecutionException.php
+++ b/typo3/sysext/scheduler/Classes/FailedExecutionException.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler;
  * Failed execution exception
  *
  * @author 	Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage scheduler
  */
 class FailedExecutionException extends \RuntimeException {
 
diff --git a/typo3/sysext/scheduler/Classes/ProgressProviderInterface.php b/typo3/sysext/scheduler/Classes/ProgressProviderInterface.php
index b7f2c9b3306d0412819988e378225acc5cbd7e7e..98fb3cef183227d7909c67b446a2d7d46e859eff 100644
--- a/typo3/sysext/scheduler/Classes/ProgressProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/ProgressProviderInterface.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler;
  * Interface for tasks who can provide their progress
  *
  * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage tx_scheduler
  */
 interface ProgressProviderInterface
 {
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index c629cd78bcf966b013f09733d13329d3a0576618..5a528698c6896cad6abd42bac869b440bc0b9297 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Scheduler;
  *
  * @author 	François Suter <francois@typo3.org>
  * @author 	Christian Jul Jensen <julle@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 886f7ba38c8e1323a7fd90eabc8e5bc786bdfa06..2981fa9dc4cef63bfd21217266aa1e125bd73d36 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  *
  * @author 	François Suter <francois@typo3.org>
  * @author 	Christian Jul Jensen <julle@typo3.org>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 abstract class AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
index b0a78f0833fb9663d9b3f5d061a7ce07fefb512e..dffababb23530e0c195abc1d7087f597ecd9cc80 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * Creates a multi selectbox with all available cache backends to select from.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage scheduler
  */
 class CachingFrameworkGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
index 0a242172d0c58ae8b8488ec7ce4e24fdf518eefa..d47a4ee30f81fc10e4c87beba2cc24fef274e49e 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * is configured to be cleaned.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage scheduler
  */
 class CachingFrameworkGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
index cba1c4e9e83d50d2bf2e79b7d5a43b0d3cd88ebc..0e0c4007e940cea5ca3775ea0c7ad701d3e00fe6 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * This class provides Scheduler plugin implementation
  *
  * @author Lorenz Ulrich <lorenz.ulrich@visol.ch>
- * @package TYPO3
- * @subpackage media
  */
 class FileIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
index 1409e407bbe52a017b3deefcfb09a69e0e190154..f0e58fb06746ba7cba1b61af3200bed60ce02ccf 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * and file modification time in days to select from.
  *
  * @author 2011 Kai Vogel <kai.vogel@speedprogs.de>
- * @package TYPO3
- * @subpackage scheduler
  */
 class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
index 74248fa839828db16ff86413659f937963f9288b..11a970455a612d46c4afe8d19c2ceddbd97ff9b3 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * given number of days.
  *
  * @author Kai Vogel <kai.vogel@speedprogs.de>
- * @package TYPO3
- * @subpackage scheduler
  */
 class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
index eb300523734a8a530f843f41abbd2cc9ea004d84..e5f51a20d57a3f815501488b5db8435ec7feaf12 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * Additional BE fields for sys log table garbage collection task.
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage scheduler
  */
 class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInterface {
 
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
index 2f3c931aaf19ffad23104edfb220bccbfa34961b..67156a246662cb801561710734970114e6a9237c 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
@@ -33,8 +33,6 @@ namespace TYPO3\CMS\Scheduler\Task;
  * See ext_localconf.php of scheduler extension for an example
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage scheduler
  */
 class TableGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
diff --git a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php b/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
index 1d6465f5b0b7673810a10292bc4692ed477a1bee..0a00b7a78d53582373821220d936c1b18a6c6969 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Scheduler\Tests\Unit\Controller;
 /**
  * Testcase for class "tx_scheduler_Module"
  *
- * @package TYPO3
- * @subpackage tx_scheduler
  * @author Andy Grunwald <andreas.grunwald@wmdb.de>
  */
 class SchedulerModuleControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
index 12953e6fe889d6674ceab9b597a52e0cd3ebef0b..5e6b33e44e93a893b786f4488bacaf1771e514e4 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Scheduler\Tests\Unit\CronCommand;
 /**
  * Testcase for class "tx_scheduler_CronCmd"
  *
- * @package TYPO3
- * @subpackage tx_scheduler
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  */
 class CronCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
index 6ad49ee431537a2aab852aa8b92ea0d7dde15d2f..b8ef8361113bc35fcd83c13172143a7e58acc237 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Scheduler\Tests\Unit\CronCommand;
  * Test case for class "tx_scheduler_CronCmd_Normalize"
  *
  * @author Christian Kuhn <lolli@schwarzbu.ch>
- * @package TYPO3
- * @subpackage tx_scheduler
  */
 class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index 9800e8606ca01c270abd435ef20b9071a2cab91c..aa87c8c232ffa0b72dd4be221a9bed822111b120 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\Scheduler\Tests\Unit\Task;
 /**
  * Testcase for class "tx_scheduler_CachingFrameworkGarbageCollection"
  *
- * @package TYPO3
- * @subpackage tx_scheduler
  * @author Christian Kuhn <lolli@schwarzbu.ch>
  */
 class CachingFrameworkGarbageCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/scheduler/cli/scheduler_cli_dispatch.php b/typo3/sysext/scheduler/cli/scheduler_cli_dispatch.php
index 4857bb34f5d7f6f7dc0360f04ac12251a00eb3e2..ed0bc27f58f1a6daa15caa2db1c5febb5b604194 100644
--- a/typo3/sysext/scheduler/cli/scheduler_cli_dispatch.php
+++ b/typo3/sysext/scheduler/cli/scheduler_cli_dispatch.php
@@ -26,8 +26,6 @@
  * This script must be included by the "CLI module dispatcher"
  *
  * @author 		Markus Friedrich <markus.friedrich@dkd.de>
- * @package 		TYPO3
- * @subpackage 	tx_scheduler
  */
 if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI && basename(PATH_thisScript) == 'cli_dispatch.phpsh') {
 	$hasTask = TRUE;
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index ac93d65bff085a15d836067f2260c5da133b71f0..fbd78835fb5fbcc62ff5c6e71e95d040d1af8d09 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -37,8 +37,6 @@ namespace TYPO3\CMS\Setup\Controller;
  * Script class for the Setup module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_setup
  */
 class SetupModuleController {
 
diff --git a/typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc b/typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
index 35f3a470c50fbf031e1755c0022d5192fdde8c79..34dc1b5af7645c49abfe07171b5919f469363f4c 100644
--- a/typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
+++ b/typo3/sysext/statictemplates/media/scripts/fe_adminLib.inc
@@ -34,8 +34,6 @@
  * Suggestions for improvement and streamlining is welcome so this powerful class could be used more and effectively.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class user_feAdmin {
 
diff --git a/typo3/sysext/statictemplates/media/scripts/plaintextLib.inc b/typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
index 3ced4fc894d1ff31118582599573c065c8f57962..66fb36337ea1722972aa32e028fba75e2df800a1 100644
--- a/typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
+++ b/typo3/sysext/statictemplates/media/scripts/plaintextLib.inc
@@ -54,8 +54,6 @@
  * (And then also "lib.alt_plaintext.renderObj" is configured extensively - basically with the TypoScript options passed to this class. See the static template "plugin.alt.plaintext")
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tslib
  */
 class user_plaintext {
 
diff --git a/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc b/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
index e4a39b5d73d5be6aa8b3dbdc1a2eedf18225ceb5..9b16dbf44994f371da3a3a911c5e65bce87a7826 100644
--- a/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
+++ b/typo3/sysext/statictemplates/media/scripts/wapversionLib.inc
@@ -73,8 +73,6 @@
  * "&type=97" anymore! This has been a source of error and confusion
  * for many people
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class user_wapversion {
diff --git a/typo3/sysext/statictemplates/media/scripts/xmlversionLib.inc b/typo3/sysext/statictemplates/media/scripts/xmlversionLib.inc
index 44eca889951453dbc8cda94ca6e78b770e177b08..d182ff93882c0479337cb15858c2511c884d6d91 100644
--- a/typo3/sysext/statictemplates/media/scripts/xmlversionLib.inc
+++ b/typo3/sysext/statictemplates/media/scripts/xmlversionLib.inc
@@ -53,8 +53,6 @@
  * }
  * }
  *
- * @package TYPO3
- * @subpackage tslib
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 class user_xmlversion {
diff --git a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
index c0a1acd71a473c48be07a6fd9a554691a4743641..a3b4ac2c31a7e95dd4ca83d83f74ee5d992ee5c5 100644
--- a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Sv;
  * Authentication services class
  *
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage tx_sv
  */
 class AbstractAuthenticationService extends \TYPO3\CMS\Core\Service\AbstractService {
 
diff --git a/typo3/sysext/sv/Classes/AuthenticationService.php b/typo3/sysext/sv/Classes/AuthenticationService.php
index 07369badbc60c6368694ea7e3fee32773f1e007d..b7f6b4fe627c3495ef48d1c21b4468639fd296bb 100644
--- a/typo3/sysext/sv/Classes/AuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AuthenticationService.php
@@ -35,8 +35,6 @@ namespace TYPO3\CMS\Sv;
  * Authentication services class
  *
  * @author René Fritz <r.fritz@colorcube.de>
- * @package TYPO3
- * @subpackage tx_sv
  */
 class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService {
 
diff --git a/typo3/sysext/sv/Classes/LoginFormHook.php b/typo3/sysext/sv/Classes/LoginFormHook.php
index 0404a46d1b1c2860bff6463e0eaeaa60ee61986e..29c4ce91db52b7d3935e1bfc9ceddc7481394cce 100644
--- a/typo3/sysext/sv/Classes/LoginFormHook.php
+++ b/typo3/sysext/sv/Classes/LoginFormHook.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Sv;
  * for the superchallenged authentication.
  *
  * @author Dmitry Dulepov <dmitry@typo3.org>
- * @package TYPO3
- * @subpackage tx_sv
  */
 class LoginFormHook {
 
diff --git a/typo3/sysext/sv/Classes/Report/ServicesListReport.php b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
index 95fa3ec5c3b25f21b57610a32bab58992c2022ce..8643a8f8601721cc7a535da73bc45bfcf4f9a5a9 100644
--- a/typo3/sysext/sv/Classes/Report/ServicesListReport.php
+++ b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
@@ -28,8 +28,6 @@ namespace TYPO3\CMS\Sv\Report;
  * Code inspired by EXT:dam/lib/class.tx_dam_svlist.php by René Fritz
  *
  * @author Francois Suter <francois@typo3.org>
- * @package TYPO3
- * @subpackage sv
  */
 class ServicesListReport implements \TYPO3\CMS\Reports\ReportInterface {
 
diff --git a/typo3/sysext/sys_action/Classes/ActionList.php b/typo3/sysext/sys_action/Classes/ActionList.php
index 0be04a141b3df94dc67f508f683edd68e5d433af..47b90069d1faf608a43e0f1afe5e3a6b2114ee68 100644
--- a/typo3/sysext/sys_action/Classes/ActionList.php
+++ b/typo3/sysext/sys_action/Classes/ActionList.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\SysAction;
  * Class for the list rendering of Web>Task Center module
  *
  * @author Thomas Maroschik <tmaroschik@dfau.de>
- * @package TYPO3
- * @subpackage core
  */
 class ActionList extends \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList {
 
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index c7808242abe9bedffc510ed085fafde7741fab38..be4e9e42e3b1f75710e8a843aa485a9f955028df 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -29,8 +29,6 @@ namespace TYPO3\CMS\SysAction;
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Georg Ringer <typo3@ringerge.org>
- * @package TYPO3
- * @subpackage tx_sysaction
  */
 class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 
diff --git a/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php b/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
index c0d71060dd02ba1b42e592baed82e34260cdb87b..64e831fcd1886e2f44279361b9c10efc93ce2a02 100644
--- a/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
+++ b/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\SysAction;
  * Adds action links to the backend's toolbar
  *
  * @author Steffen Kamper <info@sk-typo3.de>
- * @package TYPO3
- * @subpackage tx_sysaction
  */
 class ActionToolbarMenu implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInterface {
 
diff --git a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
index 425a898f18090c10f1c88fa5df5143f70a06165b..9dfd8e3d75c3c1ddf2fd852b91c4a785bdb39117 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Repository/SysNoteRepository.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote\Domain\Repository;
 /**
  * Sys_note repository
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class SysNoteRepository {
diff --git a/typo3/sysext/sys_note/Classes/Hook/InfoModuleHook.php b/typo3/sysext/sys_note/Classes/Hook/InfoModuleHook.php
index 59f9e49a8c39143977d0710980eb61e00f936d23..1af9d5ab389062a9f6d11c07bdde13c1f9fb0faf 100644
--- a/typo3/sysext/sys_note/Classes/Hook/InfoModuleHook.php
+++ b/typo3/sysext/sys_note/Classes/Hook/InfoModuleHook.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote\Hook;
 /**
  * Hook for the info module
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class InfoModuleHook {
diff --git a/typo3/sysext/sys_note/Classes/Hook/PageHook.php b/typo3/sysext/sys_note/Classes/Hook/PageHook.php
index fbd1c9e1ca2322a9ae392029c95c3e59bd9838e5..f4c2a7d1e7b0fa75864beb90b458f2ced01d88bd 100644
--- a/typo3/sysext/sys_note/Classes/Hook/PageHook.php
+++ b/typo3/sysext/sys_note/Classes/Hook/PageHook.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote\Hook;
 /**
  * Hook for the page module
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class PageHook {
diff --git a/typo3/sysext/sys_note/Classes/Hook/RecordListHook.php b/typo3/sysext/sys_note/Classes/Hook/RecordListHook.php
index 59bd1b09685140147111d4bdb6d2b675bfd1b6f0..5eba6036c3c766b4a47f1036882bc056152d2902 100644
--- a/typo3/sysext/sys_note/Classes/Hook/RecordListHook.php
+++ b/typo3/sysext/sys_note/Classes/Hook/RecordListHook.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote\Hook;
 /**
  * Hook for the list module
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class RecordListHook {
diff --git a/typo3/sysext/sys_note/Classes/SysNoteRenderer.php b/typo3/sysext/sys_note/Classes/SysNoteRenderer.php
index a63fab0c00806f4cb3c3b6bef11b86eab90dafef..ff2c9b5bfd7c3d43d4bebe79159d9c2c56a150b7 100644
--- a/typo3/sysext/sys_note/Classes/SysNoteRenderer.php
+++ b/typo3/sysext/sys_note/Classes/SysNoteRenderer.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote;
 /**
  * Render sys_notes
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class SysNoteRenderer {
diff --git a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
index 20d0e2be4fa46d2abf05eea5b313ac0f46387149..70bda1b55b2c7e2ec926f1537700db93340b2e02 100644
--- a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
+++ b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
@@ -26,8 +26,6 @@ namespace TYPO3\CMS\SysNote\ViewHelpers;
 /**
  * ViewHelper to create a link to edit a note
  *
- * @package TYPO3
- * @subpackage sys_note
  * @author Georg Ringer <typo3@ringerge.org>
  */
 class EditLinkViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
diff --git a/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php b/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
index 9c9cb1c02ed8634900283c2628c11a6b1eb0be01..694a8bafcd484e5d6ff8a4ed7e62a9f7902f199e 100644
--- a/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
+++ b/typo3/sysext/t3editor/Classes/TypoScriptReferenceLoader.php
@@ -4,7 +4,6 @@ namespace TYPO3\CMS\T3Editor;
 /**
  * Loads TSref information from a XML file an responds to an AJAX call.
  *
- * @package TYPO3
  * @author Stephan Petzl <spetzl@gmx.at>
  * @author Christian Kartnig <office@hahnepeter.de>
  */
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 15c945dd5e5be8fc383122ac7cc1e15ba1ae8b7c..c03a927204f7ffb70171f7e5020e7bf980b8e9c6 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\Taskcenter\Controller;
  * This class provides a taskcenter for BE users
  *
  * @author Georg Ringer <typo3@ringerge.org>
- * @package TYPO3
- * @subpackage taskcenter
  */
 class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/taskcenter/Classes/TaskInterface.php b/typo3/sysext/taskcenter/Classes/TaskInterface.php
index a26fe0869a931acd0d2514cf7020c23a8139e1a7..991b59a8219b1fcc3c0952bb66b3530c3a479bf5 100644
--- a/typo3/sysext/taskcenter/Classes/TaskInterface.php
+++ b/typo3/sysext/taskcenter/Classes/TaskInterface.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Taskcenter;
  * Interface for classes which provide a task.
  *
  * @author Georg Ringer <typo3@ringerge.org
- * @package TYPO3
- * @subpackage tx_taskcenter
  */
 interface TaskInterface
 {
diff --git a/typo3/sysext/taskcenter/Classes/TaskStatus.php b/typo3/sysext/taskcenter/Classes/TaskStatus.php
index c8cbe5200bf503cb721c63a2ceefb63e64277b6e..068c5e15a3c7e7566467323d9bd055f120bfc21e 100644
--- a/typo3/sysext/taskcenter/Classes/TaskStatus.php
+++ b/typo3/sysext/taskcenter/Classes/TaskStatus.php
@@ -27,8 +27,6 @@ namespace TYPO3\CMS\Taskcenter;
  * Status of tasks
  *
  * @author Georg Ringer <typo3@ringerge.org>
- * @package TYPO3
- * @subpackage taskcenter
  */
 class TaskStatus {
 
diff --git a/typo3/sysext/tsconfig_help/Classes/Controller/TypoScriptConfigHelpModuleController.php b/typo3/sysext/tsconfig_help/Classes/Controller/TypoScriptConfigHelpModuleController.php
index 7ea5971315b6cdece23e6b2f1c7bbe605837a887..67869794194420fc76ff71d03a44d21bc300781d 100644
--- a/typo3/sysext/tsconfig_help/Classes/Controller/TypoScriptConfigHelpModuleController.php
+++ b/typo3/sysext/tsconfig_help/Classes/Controller/TypoScriptConfigHelpModuleController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\TsconfigHelp\Controller;
  * Module 'TypoScript Help' for the 'tsconfig_help' extension.
  *
  * @author Stephane Schitter <stephane.schitter@free.fr>
- * @package TYPO3
- * @subpackage tx_tsconfighelp
  */
 class TypoScriptConfigHelpModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
diff --git a/typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index 0501da901eef72ae96ba74c59afff349244a7249..6af7b95045e730cfcec9ce810789171dfac0db1b 100644
--- a/typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -5,8 +5,6 @@ namespace TYPO3\CMS\TstemplateObjbrowser\Controller;
  * This class displays the submodule "TypoScript Object Browser" inside the Web > Template module
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage tx_tstemplateobjbrowser
  */
 class TypoScriptTemplateObjectBrowserModuleFunctionController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index 49d795fe0b85eb28461e8df0f34fd883a2a92c8c..faf26cba98a4e6fcf0b24ca1c2cc42acd5c8c646 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\Viewpage\Controller;
  *
  * @author Felix Kopp <felix-source@phorax.com>
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage viewpage
  */
 class ViewModuleController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
diff --git a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
index fd119e36a2c5ad06e81258e41ee3bbd32013f022..1f24f6e3d53ebe6c94d94dbcc177d8d93b72161e 100644
--- a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
+++ b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
@@ -31,8 +31,6 @@ namespace TYPO3\CMS\WizardCrpages\Controller;
  * Creates the "Create pages" wizard
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage wizard_crpages
  */
 class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
index 0636867ec110e8f4bef8966dd6b16f1c1599a85b..da492c736b7cd46c8db59250800144b36eab0b57 100644
--- a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
+++ b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
@@ -30,8 +30,6 @@ namespace TYPO3\CMS\WizardSortpages\View;
  * Creates the "Sort pages" wizard
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage wizard_sortpages
  */
 class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
 
diff --git a/typo3/wizard_tsconfig.php b/typo3/wizard_tsconfig.php
index ea39c74174f30c417586ba2ce562a3c8c3d328ac..70514ab8c11f284ca0853475899a803af06a0ab4 100644
--- a/typo3/wizard_tsconfig.php
+++ b/typo3/wizard_tsconfig.php
@@ -39,8 +39,6 @@ $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_wizards.xml');
  * TypoScript parser extension class.
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @package TYPO3
- * @subpackage core
  */
 class ext_TSparser extends t3lib_tsparser_ext {