From c7cafbee11501e81dcf680eaac2e9d8ce2565266 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Fri, 16 Nov 2012 12:41:06 +0100
Subject: [PATCH] [TASK] Remove @package and @subpackage annotations

With namespaces the @package and @subpackage annotations
do not have a real benefit anymore and can be removed.

Change-Id: Id8f4718db0c1c51ae5143a3353dd5efb42dadf70
Resolves: #43019
Releases: 6.0
Reviewed-on: http://review.typo3.org/16474
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
 index.php                                            |  2 --
 t3lib/class.t3lib_ajax.php                           |  2 --
 t3lib/class.t3lib_formmail.php                       |  2 --
 t3lib/class.t3lib_install.php                        |  2 --
 t3lib/class.t3lib_readmail.php                       |  2 --
 t3lib/class.t3lib_syntaxhl.php                       |  2 --
 t3lib/class.t3lib_userauthgroup.php                  |  2 --
 t3lib/class.t3lib_xml.php                            |  2 --
 t3lib/js/extjs/ux/flashmessages.js                   |  2 --
 t3lib/stddb/DefaultConfiguration.php                 |  2 --
 typo3/ajax.php                                       |  2 --
 typo3/class.browse_links.php                         | 12 ------------
 typo3/db_new.php                                     |  2 --
 typo3/init.php                                       |  2 --
 typo3/install/index.php                              |  2 --
 typo3/login_frameset.php                             |  2 --
 typo3/move_el.php                                    |  6 ------
 typo3/show_item.php                                  |  2 --
 .../about/Classes/Controller/AboutController.php     |  2 --
 .../sysext/about/Classes/CustomSectionsInterface.php |  2 --
 .../sysext/about/Classes/Domain/Model/Extension.php  |  2 --
 .../Domain/Repository/ExtensionRepository.php        |  2 --
 .../Classes/Controller/ModulesController.php         |  2 --
 .../Classes/Utility/FunctionsUtility.php             |  2 --
 .../adodb/Classes/View/CheckConnectionWizardView.php |  2 --
 typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php |  2 --
 typo3/sysext/backend/Classes/Clipboard/Clipboard.php |  2 --
 .../TranslationConfigurationProvider.php             |  2 --
 .../backend/Classes/Configuration/TsConfigParser.php |  2 --
 .../ConditionMatching/ConditionMatcher.php           |  2 --
 .../Classes/ContextMenu/AbstractContextMenu.php      |  2 --
 .../ContextMenu/AbstractContextMenuDataProvider.php  |  2 --
 .../Classes/ContextMenu/ContextMenuAction.php        |  2 --
 .../ContextMenu/ContextMenuActionCollection.php      |  2 --
 .../Extdirect/AbstractExtdirectContextMenu.php       |  2 --
 .../ContextMenu/Pagetree/ContextMenuDataProvider.php |  2 --
 .../Pagetree/Extdirect/ContextMenuConfiguration.php  |  2 --
 .../Renderer/AbstractContextMenuRenderer.php         |  2 --
 .../backend/Classes/Controller/BackendController.php |  2 --
 .../Controller/BackendLayoutWizardController.php     |  2 --
 .../Classes/Controller/ClickMenuController.php       |  2 --
 .../ContentElement/ElementHistoryController.php      |  2 --
 .../ContentElement/ElementInformationController.php  |  2 --
 .../ContentElement/MoveElementController.php         |  2 --
 .../ContentElement/NewContentElementController.php   |  2 --
 .../backend/Classes/Controller/DummyController.php   |  2 --
 .../Classes/Controller/EditDocumentController.php    |  2 --
 .../Controller/File/CreateFolderController.php       |  2 --
 .../Classes/Controller/File/EditFileController.php   |  2 --
 .../Classes/Controller/File/FileController.php       |  2 --
 .../Classes/Controller/File/FileUploadController.php |  2 --
 .../Classes/Controller/File/RenameFileController.php |  2 --
 .../FileSystemNavigationFrameController.php          |  2 --
 .../Classes/Controller/ListFrameLoaderController.php |  2 --
 .../backend/Classes/Controller/LoginController.php   |  2 --
 .../Classes/Controller/LoginFramesetController.php   |  2 --
 .../backend/Classes/Controller/LogoutController.php  |  2 --
 .../Classes/Controller/NewRecordController.php       |  2 --
 .../Classes/Controller/NoDocumentsOpenController.php |  2 --
 .../Classes/Controller/PageLayoutController.php      |  2 --
 .../Controller/PageTreeNavigationController.php      |  2 --
 .../Classes/Controller/ShortcutFrameController.php   |  2 --
 .../Controller/SimpleDataHandlerController.php       |  2 --
 .../Classes/Controller/Wizard/AddController.php      |  2 --
 .../Controller/Wizard/ColorpickerController.php      |  2 --
 .../Classes/Controller/Wizard/EditController.php     |  2 --
 .../Classes/Controller/Wizard/FormsController.php    |  2 --
 .../Classes/Controller/Wizard/ListController.php     |  2 --
 .../Classes/Controller/Wizard/RteController.php      |  2 --
 .../Classes/Controller/Wizard/TableController.php    |  2 --
 .../Classes/Domain/Model/Module/BackendModule.php    |  2 --
 .../Repository/Module/BackendModuleRepository.php    |  2 --
 .../sysext/backend/Classes/Form/DataPreprocessor.php |  2 --
 .../Classes/Form/DatabaseFileIconsHookInterface.php  |  2 --
 .../Form/Element/InlineElementHookInterface.php      |  2 --
 typo3/sysext/backend/Classes/Form/FormEngine.php     |  2 --
 .../Classes/FrontendBackendUserAuthentication.php    |  2 --
 .../sysext/backend/Classes/History/RecordHistory.php |  2 --
 .../InterfaceState/ExtDirect/DataProvider.php        |  2 --
 .../Classes/Module/AbstractFunctionModule.php        |  2 --
 .../backend/Classes/Module/BaseScriptClass.php       |  2 --
 .../backend/Classes/Module/ModuleController.php      |  2 --
 typo3/sysext/backend/Classes/Module/ModuleLoader.php |  2 --
 .../sysext/backend/Classes/Module/ModuleSettings.php |  2 --
 .../sysext/backend/Classes/Module/ModuleStorage.php  |  2 --
 .../Classes/RecordList/AbstractRecordList.php        |  2 --
 .../Classes/RecordList/ElementBrowserRecordList.php  |  2 --
 .../RecordList/RecordListGetTableHookInterface.php   |  2 --
 typo3/sysext/backend/Classes/Rte/AbstractRte.php     |  2 --
 .../LiveSearch/ExtDirect/LiveSearchDataProvider.php  |  2 --
 .../backend/Classes/Search/LiveSearch/LiveSearch.php |  2 --
 .../Classes/Search/LiveSearch/QueryParser.php        |  2 --
 .../backend/Classes/Sprite/AbstractSpriteHandler.php |  2 --
 .../backend/Classes/Sprite/SimpleSpriteHandler.php   |  2 --
 .../backend/Classes/Sprite/SpriteBuildingHandler.php |  2 --
 .../backend/Classes/Sprite/SpriteGenerator.php       |  2 --
 .../Classes/Sprite/SpriteIconGeneratorInterface.php  |  2 --
 .../sysext/backend/Classes/Sprite/SpriteManager.php  |  2 --
 .../backend/Classes/Template/DocumentTemplate.php    |  2 --
 .../Toolbar/ClearCacheActionsHookInterface.php       |  2 --
 .../Classes/Toolbar/ClearCacheToolbarItem.php        |  2 --
 .../Classes/Toolbar/LiveSearchToolbarItem.php        |  2 --
 .../backend/Classes/Toolbar/ShortcutToolbarItem.php  |  2 --
 .../Classes/Toolbar/ToolbarItemHookInterface.php     |  2 --
 .../backend/Classes/Tree/AbstractExtJsTree.php       |  2 --
 typo3/sysext/backend/Classes/Tree/AbstractTree.php   |  2 --
 .../Classes/Tree/AbstractTreeDataProvider.php        |  2 --
 .../Classes/Tree/AbstractTreeStateProvider.php       |  2 --
 .../backend/Classes/Tree/ComparableNodeInterface.php |  2 --
 .../Tree/DraggableAndDropableNodeInterface.php       |  2 --
 .../Classes/Tree/EditableNodeLabelInterface.php      |  2 --
 typo3/sysext/backend/Classes/Tree/ExtDirectNode.php  |  2 --
 .../Tree/Pagetree/CollectionProcessorInterface.php   |  2 --
 .../backend/Classes/Tree/Pagetree/Commands.php       |  2 --
 .../backend/Classes/Tree/Pagetree/DataProvider.php   |  2 --
 .../Classes/Tree/Pagetree/ExtdirectTreeCommands.php  |  2 --
 .../Tree/Pagetree/ExtdirectTreeDataProvider.php      |  2 --
 .../backend/Classes/Tree/Pagetree/Indicator.php      |  2 --
 .../Tree/Pagetree/IndicatorProviderInterface.php     |  2 --
 .../backend/Classes/Tree/Pagetree/PagetreeNode.php   |  2 --
 .../Classes/Tree/Pagetree/PagetreeNodeCollection.php |  2 --
 .../Classes/Tree/Renderer/AbstractTreeRenderer.php   |  2 --
 .../Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php  |  2 --
 .../Tree/Renderer/UnorderedListTreeRenderer.php      |  2 --
 .../Classes/Tree/SortedTreeNodeCollection.php        |  2 --
 typo3/sysext/backend/Classes/Tree/TreeNode.php       |  2 --
 .../backend/Classes/Tree/TreeNodeCollection.php      |  2 --
 .../backend/Classes/Tree/TreeRepresentationNode.php  |  2 --
 .../backend/Classes/Tree/View/AbstractTreeView.php   |  2 --
 .../backend/Classes/Tree/View/BrowseTreeView.php     |  2 --
 .../backend/Classes/Tree/View/FolderTreeView.php     |  2 --
 .../backend/Classes/Tree/View/PagePositionMap.php    |  2 --
 .../backend/Classes/Tree/View/PageTreeView.php       |  2 --
 .../ExtDirect/BackendUserSettingsDataProvider.php    |  2 --
 .../backend/Classes/Utility/BackendUtility.php       |  2 --
 typo3/sysext/backend/Classes/Utility/IconUtility.php |  2 --
 .../backend/Classes/View/BackendLayoutView.php       |  2 --
 typo3/sysext/backend/Classes/View/LogoView.php       |  2 --
 typo3/sysext/backend/Classes/View/ModuleMenuView.php |  2 --
 .../PageLayout/Extdirect/ExtdirectPageCommands.php   |  1 -
 typo3/sysext/backend/Classes/View/PageLayoutView.php |  2 --
 .../View/PageLayoutViewDrawItemHookInterface.php     |  2 --
 typo3/sysext/backend/Classes/View/PageTreeView.php   |  2 --
 typo3/sysext/backend/Classes/View/ThumbnailView.php  |  2 --
 .../Wizard/NewContentElementWizardHookInterface.php  |  2 --
 .../sysext/backend/Classes/Wizard/TsconfigWizard.php |  2 --
 .../ConditionMatching/ConditionMatcherTest.php       |  2 --
 .../Tests/Unit/Module/ModuleControllerTest.php       |  2 --
 .../backend/Tests/Unit/Sprite/SpriteManagerTest.php  |  2 --
 .../Tests/Unit/Tree/Pagetree/DataProviderTest.php    |  2 --
 .../Tests/Unit/Tree/SortedTreeNodeCollectionTest.php |  2 --
 .../Tests/Unit/Tree/TreeNodeCollectionTest.php       |  2 --
 .../sysext/backend/Tests/Unit/Tree/TreeNodeTest.php  |  2 --
 .../Tests/Unit/Utility/BackendUtilityTest.php        |  2 --
 .../backend/Tests/Unit/Utility/IconUtilityTest.php   |  2 --
 .../belog/Classes/Controller/AbstractController.php  |  2 --
 .../belog/Classes/Controller/ToolsController.php     |  2 --
 .../belog/Classes/Controller/WebInfoController.php   |  2 --
 .../sysext/belog/Classes/Domain/Model/Constraint.php |  2 --
 .../belog/Classes/Domain/Model/HistoryEntry.php      |  2 --
 typo3/sysext/belog/Classes/Domain/Model/LogEntry.php |  2 --
 .../sysext/belog/Classes/Domain/Model/Workspace.php  |  2 --
 .../Domain/Repository/HistoryEntryRepository.php     |  2 --
 .../Classes/Domain/Repository/LogEntryRepository.php |  2 --
 .../Domain/Repository/WorkspaceRepository.php        |  2 --
 .../Classes/Module/BackendLogModuleBootstrap.php     |  2 --
 .../Classes/ViewHelpers/Be/AddJsFileViewHelper.php   |  2 --
 .../ViewHelpers/Be/InlineSettingsArrayViewHelper.php |  2 --
 .../Classes/ViewHelpers/Be/PagePathViewHelper.php    |  2 --
 .../Classes/ViewHelpers/ErrorIconViewHelper.php      |  2 --
 .../Form/TranslateLabelSelectViewHelper.php          |  2 --
 .../Classes/ViewHelpers/FormatDetailsViewHelper.php  |  2 --
 .../Classes/ViewHelpers/HistoryEntryViewHelper.php   |  2 --
 .../ViewHelpers/IsExtensionLoadedViewHelper.php      |  2 --
 .../belog/Classes/ViewHelpers/UsernameViewHelper.php |  2 --
 .../Classes/ViewHelpers/WorkspaceTitleViewHelper.php |  2 --
 .../belog/Tests/Unit/Domain/Model/LogEntryTest.php   |  2 --
 .../Domain/Repository/HistoryEntryRepositoryTest.php |  2 --
 .../Domain/Repository/LogEntryRepositoryTest.php     |  2 --
 .../Domain/Repository/WorkspaceRepositoryTest.php    |  2 --
 .../Classes/Controller/BackendUserController.php     |  2 --
 .../beuser/Classes/Domain/Model/BackendUser.php      |  2 --
 .../beuser/Classes/Domain/Model/BackendUserGroup.php |  2 --
 typo3/sysext/beuser/Classes/Domain/Model/Demand.php  |  2 --
 .../beuser/Classes/Domain/Model/ModuleData.php       |  2 --
 .../Domain/Repository/BackendUserGroupRepository.php |  2 --
 .../Domain/Repository/BackendUserRepository.php      |  2 --
 .../Repository/BackendUserSessionRepository.php      |  2 --
 .../Classes/Service/ModuleDataStorageService.php     |  2 --
 .../Classes/ViewHelpers/Display/PagesViewHelper.php  |  2 --
 .../ViewHelpers/Display/SysFileMountsViewHelper.php  |  2 --
 .../ViewHelpers/Display/SysLanguageViewHelper.php    |  2 --
 .../Form/SelectDefaultValueViewHelper.php            |  2 --
 .../Classes/ViewHelpers/IssueCommandViewHelper.php   |  2 --
 .../beuser/Classes/ViewHelpers/SectionViewHelper.php |  2 --
 .../ViewHelpers/SpriteIconForRecordViewHelper.php    |  2 --
 .../ViewHelpers/SpriteManagerIconViewHelper.php      |  2 --
 .../Classes/ViewHelpers/SwitchUserViewHelper.php     |  2 --
 .../Tests/Unit/Domain/Model/BackendUserTest.php      |  2 --
 .../beuser/Tests/Unit/Domain/Model/DemandTest.php    |  2 --
 .../Domain/Repository/BackendUserRepositoryTest.php  |  2 --
 .../Repository/BackendUserSessionRepositoryTest.php  |  2 --
 .../Unit/Service/ModuleDataStorageServiceTest.php    |  2 --
 typo3/sysext/cms/layout/db_layout.php                |  2 --
 typo3/sysext/cms/layout/db_new_content_el.php        |  2 --
 typo3/sysext/cms/tslib/class.tslib_pagegen.php       |  2 --
 typo3/sysext/cms/tslib/index_ts.php                  |  2 --
 typo3/sysext/cms/tslib/pagegen.php                   |  2 --
 .../Classes/ExtDirect/ContextHelpDataProvider.php    |  2 --
 .../Authentication/AbstractUserAuthentication.php    |  2 --
 .../Authentication/BackendUserAuthentication.php     |  2 --
 .../core/Classes/Cache/Backend/AbstractBackend.php   |  2 --
 .../sysext/core/Classes/Cache/Backend/ApcBackend.php |  2 --
 .../core/Classes/Cache/Backend/BackendInterface.php  |  2 --
 .../core/Classes/Cache/Backend/FileBackend.php       |  2 --
 .../core/Classes/Cache/Backend/MemcachedBackend.php  |  2 --
 .../core/Classes/Cache/Backend/NullBackend.php       |  2 --
 .../sysext/core/Classes/Cache/Backend/PdoBackend.php |  2 --
 .../core/Classes/Cache/Backend/RedisBackend.php      |  2 --
 .../core/Classes/Cache/Backend/SimpleFileBackend.php |  2 --
 .../Classes/Cache/Backend/TransientMemoryBackend.php |  2 --
 .../Classes/Cache/Backend/Typo3DatabaseBackend.php   |  2 --
 .../core/Classes/Cache/Backend/WincacheBackend.php   |  2 --
 typo3/sysext/core/Classes/Cache/Cache.php            |  2 --
 typo3/sysext/core/Classes/Cache/CacheFactory.php     |  2 --
 typo3/sysext/core/Classes/Cache/CacheManager.php     |  2 --
 typo3/sysext/core/Classes/Cache/Exception.php        |  2 --
 .../Cache/Exception/ClassAlreadyLoadedException.php  |  2 --
 .../Cache/Exception/DuplicateIdentifierException.php |  2 --
 .../Cache/Exception/InvalidBackendException.php      |  2 --
 .../Cache/Exception/InvalidCacheException.php        |  2 --
 .../Classes/Cache/Exception/InvalidDataException.php |  2 --
 .../Classes/Cache/Exception/NoSuchCacheException.php |  2 --
 .../core/Classes/Cache/Frontend/AbstractFrontend.php |  2 --
 .../Classes/Cache/Frontend/FrontendInterface.php     |  2 --
 .../core/Classes/Cache/Frontend/PhpFrontend.php      |  2 --
 .../core/Classes/Cache/Frontend/StringFrontend.php   |  2 --
 .../core/Classes/Cache/Frontend/VariableFrontend.php |  2 --
 .../core/Classes/Category/CategoryRegistry.php       |  2 --
 .../Category/Collection/CategoryCollection.php       |  2 --
 .../sysext/core/Classes/Charset/CharsetConverter.php |  2 --
 .../Classes/Collection/AbstractRecordCollection.php  |  2 --
 .../core/Classes/Collection/CollectionInterface.php  |  2 --
 .../Collection/EditableCollectionInterface.php       |  2 --
 .../Collection/NameableCollectionInterface.php       |  2 --
 .../Collection/PersistableCollectionInterface.php    |  2 --
 .../Classes/Collection/RecordCollectionInterface.php |  2 --
 .../Collection/RecordCollectionRepository.php        |  2 --
 .../Collection/SortableCollectionInterface.php       |  2 --
 .../Classes/Collection/StaticRecordCollection.php    |  2 --
 .../Classes/Configuration/ConfigurationManager.php   |  2 --
 .../Classes/Configuration/FlexForm/FlexFormTools.php |  2 --
 .../ConditionMatching/AbstractConditionMatcher.php   |  2 --
 .../Classes/Controller/CommandLineController.php     |  2 --
 typo3/sysext/core/Classes/Core/Bootstrap.php         |  2 --
 typo3/sysext/core/Classes/Core/CliBootstrap.php      |  2 --
 .../sysext/core/Classes/DataHandling/DataHandler.php |  2 --
 ...DataHandlerCheckModifyAccessListHookInterface.php |  2 --
 .../DataHandlerProcessUploadHookInterface.php        |  2 --
 .../core/Classes/Database/DatabaseConnection.php     |  2 --
 typo3/sysext/core/Classes/Database/PdoHelper.php     |  2 --
 .../Database/PostProcessQueryHookInterface.php       |  2 --
 .../Database/PreProcessQueryHookInterface.php        |  2 --
 .../core/Classes/Database/PreparedStatement.php      |  2 --
 .../sysext/core/Classes/Database/QueryGenerator.php  |  2 --
 typo3/sysext/core/Classes/Database/QueryView.php     |  2 --
 .../sysext/core/Classes/Database/ReferenceIndex.php  |  2 --
 .../sysext/core/Classes/Database/RelationHandler.php |  2 --
 .../core/Classes/Database/SoftReferenceIndex.php     |  2 --
 typo3/sysext/core/Classes/Database/SqlParser.php     |  2 --
 ...TableConfigurationPostProcessingHookInterface.php |  2 --
 .../ElementBrowser/ElementBrowserHookInterface.php   |  2 --
 .../core/Classes/Encoder/JavaScriptEncoder.php       |  2 --
 .../core/Classes/Error/AbstractExceptionHandler.php  |  2 --
 .../core/Classes/Error/DebugExceptionHandler.php     |  2 --
 typo3/sysext/core/Classes/Error/ErrorHandler.php     |  2 --
 .../core/Classes/Error/ErrorHandlerInterface.php     |  2 --
 typo3/sysext/core/Classes/Error/Exception.php        |  2 --
 .../core/Classes/Error/ExceptionHandlerInterface.php |  2 --
 .../Error/Http/AbstractClientErrorException.php      |  2 --
 .../Error/Http/AbstractServerErrorException.php      |  2 --
 .../core/Classes/Error/Http/BadRequestException.php  |  2 --
 .../core/Classes/Error/Http/ForbiddenException.php   |  2 --
 .../Classes/Error/Http/PageNotFoundException.php     |  2 --
 .../Error/Http/ServiceUnavailableException.php       |  2 --
 .../core/Classes/Error/Http/StatusException.php      |  2 --
 .../Classes/Error/Http/UnauthorizedException.php     |  2 --
 .../Classes/Error/ProductionExceptionHandler.php     |  2 --
 typo3/sysext/core/Classes/Exception.php              |  2 --
 typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php |  2 --
 .../sysext/core/Classes/ExtDirect/ExtDirectDebug.php |  2 --
 .../core/Classes/ExtDirect/ExtDirectRouter.php       |  2 --
 .../FormProtection/AbstractFormProtection.php        |  2 --
 .../Classes/FormProtection/BackendFormProtection.php |  2 --
 .../FormProtection/DisabledFormProtection.php        |  2 --
 .../sysext/core/Classes/FormProtection/Exception.php |  2 --
 .../Classes/FormProtection/FormProtectionFactory.php |  2 --
 .../FormProtection/InstallToolFormProtection.php     |  2 --
 .../FrontendEditing/FrontendEditingController.php    |  2 --
 typo3/sysext/core/Classes/Html/HtmlParser.php        |  2 --
 typo3/sysext/core/Classes/Html/RteHtmlParser.php     |  2 --
 .../sysext/core/Classes/Http/AjaxRequestHandler.php  |  2 --
 typo3/sysext/core/Classes/Http/HttpRequest.php       |  2 --
 .../core/Classes/Imaging/GraphicalFunctions.php      |  2 --
 .../Classes/Integrity/DatabaseIntegrityCheck.php     |  2 --
 .../Localization/Exception/FileNotFoundException.php |  2 --
 .../Exception/InvalidParserException.php             |  2 --
 .../Exception/InvalidXmlFileException.php            |  2 --
 .../core/Classes/Localization/LanguageStore.php      |  2 --
 typo3/sysext/core/Classes/Localization/Locales.php   |  2 --
 .../Classes/Localization/LocalizationFactory.php     |  2 --
 .../Localization/Parser/AbstractXmlParser.php        |  2 --
 .../Parser/LocalizationParserInterface.php           |  2 --
 .../Localization/Parser/LocallangArrayParser.php     |  2 --
 .../Localization/Parser/LocallangXmlParser.php       |  2 --
 .../core/Classes/Localization/Parser/XliffParser.php |  2 --
 typo3/sysext/core/Classes/Locking/Locker.php         |  2 --
 typo3/sysext/core/Classes/Log/LogLevel.php           |  2 --
 typo3/sysext/core/Classes/Log/LogManager.php         |  2 --
 typo3/sysext/core/Classes/Log/LogRecord.php          |  2 --
 typo3/sysext/core/Classes/Log/Logger.php             |  2 --
 .../Log/Processor/AbstractMemoryProcessor.php        |  2 --
 .../core/Classes/Log/Processor/AbstractProcessor.php |  2 --
 .../Classes/Log/Processor/IntrospectionProcessor.php |  2 --
 .../Log/Processor/MemoryPeakUsageProcessor.php       |  2 --
 .../Classes/Log/Processor/MemoryUsageProcessor.php   |  2 --
 .../core/Classes/Log/Processor/NullProcessor.php     |  2 --
 .../Classes/Log/Processor/ProcessorInterface.php     |  2 --
 .../core/Classes/Log/Processor/WebProcessor.php      |  2 --
 .../core/Classes/Log/Writer/AbstractWriter.php       |  2 --
 .../core/Classes/Log/Writer/DatabaseWriter.php       |  2 --
 typo3/sysext/core/Classes/Log/Writer/FileWriter.php  |  2 --
 typo3/sysext/core/Classes/Log/Writer/NullWriter.php  |  2 --
 .../core/Classes/Log/Writer/PhpErrorLogWriter.php    |  2 --
 .../sysext/core/Classes/Log/Writer/SyslogWriter.php  |  2 --
 .../core/Classes/Log/Writer/WriterInterface.php      |  2 --
 typo3/sysext/core/Classes/Mail/MailMessage.php       |  2 --
 typo3/sysext/core/Classes/Mail/Mailer.php            |  2 --
 .../core/Classes/Mail/MailerAdapterInterface.php     |  2 --
 typo3/sysext/core/Classes/Mail/MboxTransport.php     |  2 --
 .../sysext/core/Classes/Mail/SwiftMailerAdapter.php  |  2 --
 .../core/Classes/Messaging/AbstractMessage.php       |  2 --
 .../Classes/Messaging/AbstractStandaloneMessage.php  |  2 --
 .../core/Classes/Messaging/ErrorpageMessage.php      |  2 --
 typo3/sysext/core/Classes/Messaging/FlashMessage.php |  2 --
 .../core/Classes/Messaging/FlashMessageQueue.php     |  2 --
 typo3/sysext/core/Classes/Page/PageRenderer.php      |  2 --
 typo3/sysext/core/Classes/Registry.php               |  2 --
 typo3/sysext/core/Classes/Resource/AbstractFile.php  |  2 --
 .../core/Classes/Resource/AbstractRepository.php     |  2 --
 .../Resource/Collection/AbstractFileCollection.php   |  2 --
 .../Collection/FolderBasedFileCollection.php         |  2 --
 .../Resource/Collection/StaticFileCollection.php     |  2 --
 .../core/Classes/Resource/Driver/AbstractDriver.php  |  2 --
 .../core/Classes/Resource/Driver/DriverRegistry.php  |  2 --
 .../core/Classes/Resource/Driver/LocalDriver.php     |  2 --
 typo3/sysext/core/Classes/Resource/Exception.php     |  2 --
 .../Exception/AbstractFileOperationException.php     |  2 --
 .../Exception/ExistingTargetFileNameException.php    |  2 --
 .../Exception/ExistingTargetFolderException.php      |  2 --
 .../Resource/Exception/FileDoesNotExistException.php |  2 --
 .../Exception/FileOperationErrorException.php        |  2 --
 .../Exception/FolderDoesNotExistException.php        |  2 --
 .../Exception/IllegalFileExtensionException.php      |  2 --
 .../InsufficientFileAccessPermissionsException.php   |  2 --
 .../InsufficientFileReadPermissionsException.php     |  2 --
 .../InsufficientFileWritePermissionsException.php    |  2 --
 .../InsufficientFolderAccessPermissionsException.php |  2 --
 .../InsufficientFolderReadPermissionsException.php   |  2 --
 .../InsufficientFolderWritePermissionsException.php  |  2 --
 .../InsufficientUserPermissionsException.php         |  2 --
 .../Exception/InvalidConfigurationException.php      |  2 --
 .../Resource/Exception/InvalidFileException.php      |  2 --
 .../Resource/Exception/InvalidFileNameException.php  |  2 --
 .../Resource/Exception/InvalidFolderException.php    |  2 --
 .../Resource/Exception/InvalidPathException.php      |  2 --
 .../Exception/InvalidTargetFolderException.php       |  2 --
 .../Resource/Exception/NotInMountPointException.php  |  2 --
 .../Classes/Resource/Exception/UploadException.php   |  2 --
 .../Resource/Exception/UploadSizeException.php       |  2 --
 typo3/sysext/core/Classes/Resource/File.php          |  2 --
 .../Classes/Resource/FileCollectionRepository.php    |  2 --
 typo3/sysext/core/Classes/Resource/FileInterface.php |  2 --
 typo3/sysext/core/Classes/Resource/FileReference.php |  2 --
 .../sysext/core/Classes/Resource/FileRepository.php  |  2 --
 .../Classes/Resource/Filter/FileExtensionFilter.php  |  2 --
 .../core/Classes/Resource/Filter/FileNameFilter.php  |  2 --
 typo3/sysext/core/Classes/Resource/Folder.php        |  2 --
 .../sysext/core/Classes/Resource/FolderInterface.php |  2 --
 .../core/Classes/Resource/Hook/FileInfoHook.php      |  2 --
 typo3/sysext/core/Classes/Resource/ProcessedFile.php |  2 --
 .../Classes/Resource/ProcessedFileRepository.php     |  2 --
 .../core/Classes/Resource/ResourceCompressor.php     |  2 --
 .../sysext/core/Classes/Resource/ResourceFactory.php |  2 --
 .../core/Classes/Resource/ResourceInterface.php      |  2 --
 .../sysext/core/Classes/Resource/ResourceStorage.php |  2 --
 .../Resource/Service/FileProcessingService.php       |  2 --
 .../Service/FrontendContentAdapterService.php        |  1 -
 .../Resource/Service/ImageProcessingService.php      |  2 --
 .../core/Classes/Resource/Service/IndexerService.php |  2 --
 .../Classes/Resource/Service/MagicImageService.php   |  2 --
 .../Resource/Service/UserFileMountService.php        |  2 --
 .../core/Classes/Resource/StorageRepository.php      |  2 --
 .../sysext/core/Classes/Service/AbstractService.php  |  2 --
 typo3/sysext/core/Classes/SingletonInterface.php     |  2 --
 .../core/Classes/TimeTracker/NullTimeTracker.php     |  2 --
 .../sysext/core/Classes/TimeTracker/TimeTracker.php  |  2 --
 .../AbstractTableConfigurationTreeDataProvider.php   |  1 -
 .../TableConfiguration/DatabaseTreeDataProvider.php  |  2 --
 .../Tree/TableConfiguration/DatabaseTreeNode.php     |  2 --
 .../TableConfiguration/ExtJsArrayTreeRenderer.php    |  2 --
 .../TableConfiguration/TableConfigurationTree.php    |  2 --
 .../TableConfiguration/TreeDataProviderFactory.php   |  2 --
 .../core/Classes/TypoScript/ConfigurationForm.php    |  2 --
 .../Classes/TypoScript/ExtendedTemplateService.php   |  2 --
 .../Classes/TypoScript/Parser/TypoScriptParser.php   |  2 --
 .../core/Classes/TypoScript/TemplateService.php      |  2 --
 typo3/sysext/core/Classes/Utility/ArrayUtility.php   |  2 --
 typo3/sysext/core/Classes/Utility/DebugUtility.php   |  2 --
 typo3/sysext/core/Classes/Utility/DiffUtility.php    |  2 --
 .../Classes/Utility/ExtensionManagementUtility.php   |  2 --
 .../core/Classes/Utility/File/BasicFileUtility.php   |  2 --
 .../Classes/Utility/File/ExtendedFileUtility.php     |  2 --
 .../ExtendedFileUtilityProcessDataHookInterface.php  |  2 --
 typo3/sysext/core/Classes/Utility/GeneralUtility.php |  2 --
 typo3/sysext/core/Classes/Utility/HttpUtility.php    |  2 --
 typo3/sysext/core/Classes/Utility/MailUtility.php    |  2 --
 typo3/sysext/core/Classes/Utility/MathUtility.php    |  2 --
 typo3/sysext/core/Classes/Utility/PathUtility.php    |  2 --
 .../core/Classes/Utility/PhpOptionsUtility.php       |  2 --
 .../sysext/core/Classes/Utility/RootlineUtility.php  |  2 --
 typo3/sysext/core/Classes/Utility/StringUtility.php  |  2 --
 .../core/Classes/Utility/VersionNumberUtility.php    |  2 --
 .../sysext/core/Tests/AccessibleObjectInterface.php  |  2 --
 .../Category/Collection/CategoryCollectionTest.php   |  2 --
 .../core/Tests/Functional/Resource/BaseTestCase.php  |  2 --
 .../core/Tests/Functional/Resource/FolderTest.php    |  1 -
 .../Functional/Resource/ResourceStorageTest.php      |  2 --
 .../Tests/Legacy/t3lib/class.t3lib_formmailTest.php  |  2 --
 .../Legacy/typo3/contrib/class.removexssTest.php     |  2 --
 .../AbstractUserAuthenticationTest.php               |  2 --
 .../Authentication/BackendUserAuthenticationTest.php |  2 --
 .../Tests/Unit/Cache/Backend/AbstractBackendTest.php |  2 --
 .../core/Tests/Unit/Cache/Backend/ApcBackendTest.php |  2 --
 .../core/Tests/Unit/Cache/Backend/DbBackendTest.php  |  2 --
 .../Tests/Unit/Cache/Backend/FileBackendTest.php     |  2 --
 .../Unit/Cache/Backend/MemcachedBackendTest.php      |  2 --
 .../core/Tests/Unit/Cache/Backend/MockBackend.php    |  2 --
 .../core/Tests/Unit/Cache/Backend/PdoBackendTest.php |  2 --
 .../Tests/Unit/Cache/Backend/RedisBackendTest.php    |  2 --
 .../Cache/Backend/TransientMemoryBackendTest.php     |  2 --
 .../Tests/Unit/Cache/Backend/WincacheBackendTest.php |  2 --
 .../core/Tests/Unit/Cache/CacheManagerTest.php       |  2 --
 typo3/sysext/core/Tests/Unit/Cache/FactoryTest.php   |  2 --
 .../Unit/Cache/Frontend/AbstractFrontendTest.php     |  2 --
 .../Tests/Unit/Cache/Frontend/PhpFrontendTest.php    |  2 --
 .../Tests/Unit/Cache/Frontend/StringFrontendTest.php |  2 --
 .../Unit/Cache/Frontend/VariableFrontendTest.php     |  2 --
 .../Tests/Unit/Category/CategoryRegistryTest.php     |  2 --
 .../Category/Collection/CategoryCollectionTest.php   |  2 --
 .../core/Tests/Unit/Charset/CharsetConverterTest.php |  2 --
 .../Collection/RecordCollectionRepositoryTest.php    |  2 --
 .../Unit/Configuration/ConfigurationManagerTest.php  |  2 --
 .../sysext/core/Tests/Unit/Core/ClassLoaderTest.php  |  2 --
 .../Tests/Unit/Core/Fixtures/LegacyClassFixture.php  |  2 --
 .../Tests/Unit/Core/SystemEnvironmentBuilderTest.php |  2 --
 .../core/Tests/Unit/DataHandling/DataHandlerTest.php |  2 --
 .../Tests/Unit/Database/DatabaseConnectionTest.php   |  2 --
 .../Tests/Unit/Database/PreparedStatementTest.php    |  2 --
 .../core/Tests/Unit/Database/SqlParserTest.php       |  2 --
 .../Tests/Unit/Encoder/JavaScriptEncoderTest.php     |  2 --
 .../Tests/Unit/Error/DebugExceptionHandlerTest.php   |  2 --
 .../Unit/Error/ProductionExceptionHandlerTest.php    |  2 --
 .../FormProtection/AbstractFormProtectionTest.php    |  2 --
 .../FormProtection/BackendFormProtectionTest.php     |  2 --
 .../Fixtures/FormProtectionTesting.php               |  2 --
 .../FormProtection/FormProtectionFactoryTest.php     |  2 --
 .../FormProtection/InstallToolFormProtectionTest.php |  2 --
 .../core/Tests/Unit/Html/RteHtmlParserTest.php       |  2 --
 .../Tests/Unit/Imaging/GraphicalFunctionsTest.php    |  2 --
 .../Localization/Parser/LocallangXmlParserTest.php   |  1 -
 .../Unit/Localization/Parser/XliffParserTest.php     |  1 -
 typo3/sysext/core/Tests/Unit/Locking/LockerTest.php  |  2 --
 typo3/sysext/core/Tests/Unit/Log/LogLevelTest.php    |  2 --
 typo3/sysext/core/Tests/Unit/Log/LogManagerTest.php  |  2 --
 typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php   |  2 --
 typo3/sysext/core/Tests/Unit/Log/LoggerTest.php      |  2 --
 .../Tests/Unit/Log/Processor/IntrospectionTest.php   |  2 --
 .../Tests/Unit/Log/Processor/MemoryPeakUsageTest.php |  2 --
 .../Tests/Unit/Log/Processor/MemoryUsageTest.php     |  2 --
 .../core/Tests/Unit/Log/Processor/ProcessorTest.php  |  2 --
 .../sysext/core/Tests/Unit/Log/Processor/WebTest.php |  2 --
 typo3/sysext/core/Tests/Unit/Mail/MailerTest.php     |  2 --
 .../core/Tests/Unit/Mail/SwiftMailerAdapterTest.php  |  2 --
 .../sysext/core/Tests/Unit/Page/PageRendererTest.php |  2 --
 typo3/sysext/core/Tests/Unit/RegistryTest.php        |  2 --
 .../sysext/core/Tests/Unit/Resource/BaseTestCase.php |  2 --
 .../Unit/Resource/Driver/AbstractDriverTest.php      |  2 --
 .../Unit/Resource/Driver/DriverRegistryTest.php      |  2 --
 .../Tests/Unit/Resource/Driver/LocalDriverTest.php   |  2 --
 .../sysext/core/Tests/Unit/Resource/FactoryTest.php  |  2 --
 typo3/sysext/core/Tests/Unit/Resource/FileTest.php   |  2 --
 typo3/sysext/core/Tests/Unit/Resource/FolderTest.php |  2 --
 .../Resource/Repository/AbstractRepositoryTest.php   |  2 --
 .../core/Tests/Unit/Resource/ResourceStorageTest.php |  2 --
 .../Unit/Resource/Service/IndexerServiceTest.php     |  2 --
 .../Resource/Utility/FileExtensionFilterTest.php     |  2 --
 .../Tests/Unit/TypoScript/TemplateServiceTest.php    |  2 --
 .../core/Tests/Unit/Utility/ArrayUtilityTest.php     |  2 --
 .../core/Tests/Unit/Utility/ClientUtilityTest.php    |  2 --
 .../Unit/Utility/ExtensionMangementUtilityTest.php   |  2 --
 .../Unit/Utility/File/ExtendedFileUtilityTest.php    |  2 --
 ...ilityTestClassWithStringRepresentationFixture.php |  2 --
 .../RootlineUtilityTestAccessibleFixture.php         |  2 --
 .../core/Tests/Unit/Utility/GeneralUtilityTest.php   |  2 --
 .../core/Tests/Unit/Utility/HttpUtilityTest.php      |  2 --
 .../core/Tests/Unit/Utility/MailUtilityTest.php      |  2 --
 .../core/Tests/Unit/Utility/MathUtilityTest.php      |  2 --
 .../core/Tests/Unit/Utility/PathUtilityTest.php      |  2 --
 .../core/Tests/Unit/Utility/RootlineUtilityTest.php  |  2 --
 .../core/Tests/Unit/Utility/StringUtilityTest.php    |  2 --
 .../Tests/Unit/Utility/VersionNumberUtilityTest.php  |  2 --
 .../Classes/Controller/HelpModuleController.php      |  2 --
 typo3/sysext/cshmanual/mod/index.php                 |  2 --
 .../Controller/CssStyledContentController.php        |  2 --
 .../Classes/Controller/AbstractController.php        |  2 --
 .../Classes/Controller/ActionController.php          |  2 --
 .../Classes/Controller/ConfigurationController.php   |  2 --
 .../Classes/Controller/DownloadController.php        |  2 --
 .../Classes/Controller/ListController.php            |  2 --
 .../Classes/Controller/UpdateFromTerController.php   |  2 --
 .../Controller/UploadExtensionFileController.php     |  2 --
 .../Classes/Domain/Model/ConfigurationCategory.php   |  2 --
 .../Classes/Domain/Model/ConfigurationItem.php       |  2 --
 .../Domain/Model/ConfigurationSubcategory.php        |  2 --
 .../Classes/Domain/Model/Dependency.php              |  2 --
 .../Classes/Domain/Model/DownloadQueue.php           |  2 --
 .../Classes/Domain/Model/Extension.php               |  2 --
 .../Classes/Domain/Model/Mirrors.php                 |  2 --
 .../Classes/Domain/Model/Repository.php              |  2 --
 .../Repository/ConfigurationItemRepository.php       |  2 --
 .../Domain/Repository/ExtensionRepository.php        |  2 --
 .../Domain/Repository/RepositoryRepository.php       |  2 --
 .../Classes/Exception/ExtensionManagerException.php  |  2 --
 .../Classes/Service/ExtensionManagementService.php   |  2 --
 .../Classes/Utility/ConfigurationUtility.php         |  2 --
 .../Classes/Utility/Connection/TerUtility.php        |  2 --
 .../Classes/Utility/DatabaseUtility.php              |  2 --
 .../Classes/Utility/DependencyUtility.php            |  2 --
 .../Classes/Utility/DownloadUtility.php              |  2 --
 .../Classes/Utility/EmConfUtility.php                |  2 --
 .../Classes/Utility/FileHandlingUtility.php          |  2 --
 .../Utility/Importer/ExtensionListUtility.php        |  2 --
 .../Classes/Utility/Importer/MirrorListUtility.php   |  2 --
 .../Classes/Utility/InstallUtility.php               |  2 --
 .../extensionmanager/Classes/Utility/ListUtility.php |  2 --
 .../Utility/Parser/AbstractExtensionXmlParser.php    |  2 --
 .../Utility/Parser/AbstractMirrorXmlParser.php       |  2 --
 .../Classes/Utility/Parser/AbstractXmlParser.php     |  2 --
 .../Utility/Parser/ExtensionXmlPullParser.php        |  2 --
 .../Utility/Parser/ExtensionXmlPushParser.php        |  2 --
 .../Classes/Utility/Parser/MirrorXmlPullParser.php   |  2 --
 .../Classes/Utility/Parser/MirrorXmlPushParser.php   |  2 --
 .../Classes/Utility/Parser/XmlParserFactory.php      |  2 --
 .../Classes/Utility/Repository/Helper.php            |  2 --
 .../ViewHelpers/ConfigureExtensionViewHelper.php     |  2 --
 .../ViewHelpers/DownloadExtensionDataViewHelper.php  |  2 --
 .../ViewHelpers/DownloadExtensionViewHelper.php      |  2 --
 .../Form/TypoScriptConstantsViewHelper.php           |  2 --
 .../Classes/ViewHelpers/Format/ImplodeViewHelper.php |  2 --
 .../InstallationStateCssClassViewHelper.php          |  2 --
 .../ViewHelpers/RemoveExtensionViewHelper.php        |  2 --
 .../ViewHelpers/ShowExtensionVersionsViewHelper.php  |  2 --
 .../ToggleExtensionInstallationStateViewHelper.php   |  2 --
 .../Classes/ViewHelpers/UpdateFromTerViewHelper.php  |  2 --
 .../Unit/Controller/UpdateFromTerControllerTest.php  |  2 --
 .../Tests/Unit/Domain/Model/DownloadQueueTest.php    |  2 --
 .../Repository/ConfigurationItemRepositoryTest.php   |  2 --
 .../Unit/Service/ExtensionManagementServiceTest.php  |  2 --
 .../Tests/Unit/Utility/ConfigurationUtilityTest.php  |  2 --
 .../Tests/Unit/Utility/DependencyUtilityTest.php     |  2 --
 .../Tests/Unit/Utility/EmConfUtilityTest.php         |  2 --
 .../Tests/Unit/Utility/FileHandlingUtilityTest.php   |  2 --
 .../Tests/Unit/Utility/InstallUtilityTest.php        |  2 --
 .../Tests/Unit/Utility/ListUtilityTest.php           |  2 --
 .../Classes/ExtraPageContextMenuOptions.php          |  2 --
 typo3/sysext/feedit/Classes/FrontendEditPanel.php    |  2 --
 .../Classes/Controller/FrontendLoginController.php   |  2 --
 typo3/sysext/felogin/Classes/Hooks/CmsLayout.php     |  2 --
 .../Unit/Controller/FrontendLoginControllerTest.php  |  2 --
 .../Classes/Controller/FileListController.php        |  2 --
 typo3/sysext/filelist/Classes/FileList.php           |  2 --
 .../Classes/FileListEditIconHookInterface.php        |  2 --
 typo3/sysext/filelist/Classes/FileListFolderTree.php |  2 --
 .../form/Classes/Controller/FormController.php       |  2 --
 .../form/Classes/Controller/WizardController.php     |  2 --
 .../form/Classes/Domain/Factory/JsonToTyposcript.php |  2 --
 .../Classes/Domain/Factory/TypoScriptFactory.php     |  2 --
 .../Model/Additional/AbstractAdditionalElement.php   |  2 --
 .../Model/Additional/AdditionalAdditionalElement.php |  2 --
 .../Model/Additional/ErrorAdditionalElement.php      |  2 --
 .../Model/Additional/LabelAdditionalElement.php      |  2 --
 .../Model/Additional/LegendAdditionalElement.php     |  2 --
 .../Model/Additional/MandatoryAdditionalElement.php  |  2 --
 .../Domain/Model/Attribute/AbstractAttribute.php     |  2 --
 .../Domain/Model/Attribute/AcceptAttribute.php       |  2 --
 .../Model/Attribute/AcceptCharsetAttribute.php       |  2 --
 .../Domain/Model/Attribute/AccesskeyAttribute.php    |  2 --
 .../Domain/Model/Attribute/ActionAttribute.php       |  2 --
 .../Classes/Domain/Model/Attribute/AltAttribute.php  |  2 --
 .../Domain/Model/Attribute/AttributesAttribute.php   |  2 --
 .../Domain/Model/Attribute/CheckedAttribute.php      |  2 --
 .../Domain/Model/Attribute/ClassAttribute.php        |  2 --
 .../Classes/Domain/Model/Attribute/ColsAttribute.php |  2 --
 .../Classes/Domain/Model/Attribute/DirAttribute.php  |  2 --
 .../Domain/Model/Attribute/DisabledAttribute.php     |  2 --
 .../Domain/Model/Attribute/EnctypeAttribute.php      |  2 --
 .../Classes/Domain/Model/Attribute/IdAttribute.php   |  2 --
 .../Domain/Model/Attribute/LabelAttribute.php        |  2 --
 .../Classes/Domain/Model/Attribute/LangAttribute.php |  2 --
 .../Domain/Model/Attribute/MaxlengthAttribute.php    |  2 --
 .../Domain/Model/Attribute/MethodAttribute.php       |  2 --
 .../Domain/Model/Attribute/MultipleAttribute.php     |  2 --
 .../Classes/Domain/Model/Attribute/NameAttribute.php |  2 --
 .../Domain/Model/Attribute/ReadonlyAttribute.php     |  2 --
 .../Classes/Domain/Model/Attribute/RowsAttribute.php |  2 --
 .../Domain/Model/Attribute/SelectedAttribute.php     |  2 --
 .../Classes/Domain/Model/Attribute/SizeAttribute.php |  2 --
 .../Classes/Domain/Model/Attribute/SrcAttribute.php  |  2 --
 .../Domain/Model/Attribute/StyleAttribute.php        |  2 --
 .../Domain/Model/Attribute/TabindexAttribute.php     |  2 --
 .../Domain/Model/Attribute/TitleAttribute.php        |  2 --
 .../Classes/Domain/Model/Attribute/TypeAttribute.php |  2 --
 .../Domain/Model/Attribute/ValueAttribute.php        |  2 --
 typo3/sysext/form/Classes/Domain/Model/Content.php   |  2 --
 .../Classes/Domain/Model/Element/AbstractElement.php |  2 --
 .../Domain/Model/Element/AbstractPlainElement.php    |  2 --
 .../Classes/Domain/Model/Element/ButtonElement.php   |  2 --
 .../Classes/Domain/Model/Element/CheckboxElement.php |  2 --
 .../Domain/Model/Element/CheckboxGroupElement.php    |  2 --
 .../Domain/Model/Element/ContainerElement.php        |  2 --
 .../Classes/Domain/Model/Element/ContentElement.php  |  2 --
 .../Classes/Domain/Model/Element/FieldsetElement.php |  2 --
 .../Domain/Model/Element/FileuploadElement.php       |  2 --
 .../Classes/Domain/Model/Element/HeaderElement.php   |  2 --
 .../Classes/Domain/Model/Element/HiddenElement.php   |  2 --
 .../Domain/Model/Element/ImagebuttonElement.php      |  2 --
 .../Classes/Domain/Model/Element/OptgroupElement.php |  2 --
 .../Classes/Domain/Model/Element/OptionElement.php   |  2 --
 .../Classes/Domain/Model/Element/PasswordElement.php |  2 --
 .../Classes/Domain/Model/Element/RadioElement.php    |  2 --
 .../Domain/Model/Element/RadioGroupElement.php       |  2 --
 .../Classes/Domain/Model/Element/ResetElement.php    |  2 --
 .../Classes/Domain/Model/Element/SelectElement.php   |  2 --
 .../Classes/Domain/Model/Element/SubmitElement.php   |  2 --
 .../Classes/Domain/Model/Element/TextareaElement.php |  2 --
 .../Domain/Model/Element/TextblockElement.php        |  2 --
 .../Classes/Domain/Model/Element/TextlineElement.php |  2 --
 typo3/sysext/form/Classes/Domain/Model/Form.php      |  2 --
 .../Domain/Model/Json/AbstractJsonElement.php        |  2 --
 .../Classes/Domain/Model/Json/ButtonJsonElement.php  |  2 --
 .../Domain/Model/Json/CheckboxGroupJsonElement.php   |  2 --
 .../Domain/Model/Json/CheckboxJsonElement.php        |  2 --
 .../Domain/Model/Json/ContainerJsonElement.php       |  2 --
 .../Domain/Model/Json/FieldsetJsonElement.php        |  2 --
 .../Domain/Model/Json/FileuploadJsonElement.php      |  2 --
 .../Classes/Domain/Model/Json/FormJsonElement.php    |  2 --
 .../Classes/Domain/Model/Json/HeaderJsonElement.php  |  2 --
 .../Classes/Domain/Model/Json/HiddenJsonElement.php  |  2 --
 .../Classes/Domain/Model/Json/NameJsonElement.php    |  2 --
 .../Domain/Model/Json/PasswordJsonElement.php        |  2 --
 .../Domain/Model/Json/RadioGroupJsonElement.php      |  2 --
 .../Classes/Domain/Model/Json/RadioJsonElement.php   |  2 --
 .../Classes/Domain/Model/Json/ResetJsonElement.php   |  2 --
 .../Classes/Domain/Model/Json/SelectJsonElement.php  |  2 --
 .../Classes/Domain/Model/Json/SubmitJsonElement.php  |  2 --
 .../Domain/Model/Json/TextareaJsonElement.php        |  2 --
 .../Domain/Model/Json/TextblockJsonElement.php       |  2 --
 .../Domain/Model/Json/TextlineJsonElement.php        |  2 --
 .../Classes/Domain/Repository/ContentRepository.php  |  2 --
 typo3/sysext/form/Classes/ElementCounter.php         |  2 --
 .../sysext/form/Classes/Filter/AlphabeticFilter.php  |  2 --
 .../form/Classes/Filter/AlphanumericFilter.php       |  2 --
 typo3/sysext/form/Classes/Filter/CurrencyFilter.php  |  2 --
 typo3/sysext/form/Classes/Filter/DigitFilter.php     |  2 --
 typo3/sysext/form/Classes/Filter/FilterInterface.php |  2 --
 typo3/sysext/form/Classes/Filter/IntegerFilter.php   |  2 --
 typo3/sysext/form/Classes/Filter/LowerCaseFilter.php |  2 --
 typo3/sysext/form/Classes/Filter/RegExpFilter.php    |  2 --
 typo3/sysext/form/Classes/Filter/RemoveXssFilter.php |  2 --
 .../form/Classes/Filter/StripNewLinesFilter.php      |  2 --
 typo3/sysext/form/Classes/Filter/TitleCaseFilter.php |  2 --
 typo3/sysext/form/Classes/Filter/TrimFilter.php      |  2 --
 typo3/sysext/form/Classes/Filter/UpperCaseFilter.php |  2 --
 typo3/sysext/form/Classes/Layout.php                 |  2 --
 typo3/sysext/form/Classes/Localization.php           |  2 --
 .../form/Classes/PostProcess/MailPostProcessor.php   |  2 --
 .../form/Classes/PostProcess/PostProcessor.php       |  2 --
 .../Classes/PostProcess/PostProcessorInterface.php   |  2 --
 typo3/sysext/form/Classes/Request.php                |  2 --
 typo3/sysext/form/Classes/Utility/FilterUtility.php  |  2 --
 typo3/sysext/form/Classes/Utility/FormUtility.php    |  2 --
 .../Classes/Utility/TypoScriptToJsonConverter.php    |  2 --
 .../sysext/form/Classes/Utility/ValidatorUtility.php |  2 --
 .../form/Classes/Validation/AbstractValidator.php    |  2 --
 .../form/Classes/Validation/AlphabeticValidator.php  |  2 --
 .../Classes/Validation/AlphanumericValidator.php     |  2 --
 .../form/Classes/Validation/BetweenValidator.php     |  2 --
 .../sysext/form/Classes/Validation/DateValidator.php |  2 --
 .../form/Classes/Validation/DigitValidator.php       |  2 --
 .../form/Classes/Validation/EmailValidator.php       |  2 --
 .../form/Classes/Validation/EqualsValidator.php      |  2 --
 .../Classes/Validation/FileAllowedTypesValidator.php |  2 --
 .../Classes/Validation/FileMaximumSizeValidator.php  |  2 --
 .../Classes/Validation/FileMinimumSizeValidator.php  |  2 --
 .../form/Classes/Validation/FloatValidator.php       |  2 --
 .../form/Classes/Validation/GreaterThanValidator.php |  2 --
 .../form/Classes/Validation/InArrayValidator.php     |  2 --
 .../form/Classes/Validation/IntegerValidator.php     |  2 --
 typo3/sysext/form/Classes/Validation/IpValidator.php |  2 --
 .../form/Classes/Validation/LengthValidator.php      |  2 --
 .../form/Classes/Validation/LessthanValidator.php    |  2 --
 .../form/Classes/Validation/RegExpValidator.php      |  2 --
 .../form/Classes/Validation/RequiredValidator.php    |  2 --
 .../sysext/form/Classes/Validation/UriValidator.php  |  2 --
 .../form/Classes/Validation/ValidatorInterface.php   |  2 --
 .../Additional/AdditionalElementView.php             |  2 --
 .../Additional/LabelAdditionalElementView.php        |  2 --
 .../Additional/LegendAdditionalElementView.php       |  2 --
 .../Classes/View/Confirmation/ConfirmationView.php   |  2 --
 .../Confirmation/Element/AbstractElementView.php     |  2 --
 .../Confirmation/Element/CheckboxElementView.php     |  2 --
 .../Element/CheckboxGroupElementView.php             |  2 --
 .../Confirmation/Element/ContainerElementView.php    |  2 --
 .../Confirmation/Element/FieldsetElementView.php     |  2 --
 .../Confirmation/Element/FileuploadElementView.php   |  2 --
 .../Confirmation/Element/OptgroupElementView.php     |  2 --
 .../View/Confirmation/Element/OptionElementView.php  |  2 --
 .../View/Confirmation/Element/RadioElementView.php   |  2 --
 .../Confirmation/Element/RadioGroupElementView.php   |  2 --
 .../View/Confirmation/Element/SelectElementView.php  |  2 --
 .../Confirmation/Element/TextareaElementView.php     |  2 --
 .../Confirmation/Element/TextlineElementView.php     |  2 --
 .../View/Form/Additional/AdditionalElementView.php   |  2 --
 .../Form/Additional/ErrorAdditionalElementView.php   |  2 --
 .../Form/Additional/LabelAdditionalElementView.php   |  2 --
 .../Form/Additional/LegendAdditionalElementView.php  |  2 --
 .../Additional/MandatoryAdditionalElementView.php    |  2 --
 .../View/Form/Element/AbstractElementView.php        |  2 --
 .../Classes/View/Form/Element/ButtonElementView.php  |  2 --
 .../View/Form/Element/CheckboxElementView.php        |  2 --
 .../View/Form/Element/CheckboxGroupElementView.php   |  2 --
 .../View/Form/Element/ContainerElementView.php       |  2 --
 .../Classes/View/Form/Element/ContentElementView.php |  2 --
 .../View/Form/Element/FieldsetElementView.php        |  2 --
 .../View/Form/Element/FileuploadElementView.php      |  2 --
 .../Classes/View/Form/Element/HeaderElementView.php  |  2 --
 .../Classes/View/Form/Element/HiddenElementView.php  |  2 --
 .../View/Form/Element/ImagebuttonElementView.php     |  2 --
 .../View/Form/Element/OptgroupElementView.php        |  2 --
 .../Classes/View/Form/Element/OptionElementView.php  |  2 --
 .../View/Form/Element/PasswordElementView.php        |  2 --
 .../Classes/View/Form/Element/RadioElementView.php   |  2 --
 .../View/Form/Element/RadioGroupElementView.php      |  2 --
 .../Classes/View/Form/Element/ResetElementView.php   |  2 --
 .../Classes/View/Form/Element/SelectElementView.php  |  2 --
 .../Classes/View/Form/Element/SubmitElementView.php  |  2 --
 .../View/Form/Element/TextareaElementView.php        |  2 --
 .../View/Form/Element/TextblockElementView.php       |  2 --
 .../View/Form/Element/TextlineElementView.php        |  2 --
 typo3/sysext/form/Classes/View/Form/FormView.php     |  2 --
 .../Mail/Html/Additional/AdditionalElementView.php   |  2 --
 .../Html/Additional/LabelAdditionalElementView.php   |  2 --
 .../Html/Additional/LegendAdditionalElementView.php  |  2 --
 .../View/Mail/Html/Element/AbstractElementView.php   |  2 --
 .../View/Mail/Html/Element/CheckboxElementView.php   |  2 --
 .../Mail/Html/Element/CheckboxGroupElementView.php   |  2 --
 .../View/Mail/Html/Element/ContainerElementView.php  |  2 --
 .../View/Mail/Html/Element/FieldsetElementView.php   |  2 --
 .../View/Mail/Html/Element/FileuploadElementView.php |  2 --
 .../View/Mail/Html/Element/HiddenElementView.php     |  2 --
 .../View/Mail/Html/Element/OptgroupElementView.php   |  2 --
 .../View/Mail/Html/Element/OptionElementView.php     |  2 --
 .../View/Mail/Html/Element/RadioElementView.php      |  2 --
 .../View/Mail/Html/Element/RadioGroupElementView.php |  2 --
 .../View/Mail/Html/Element/SelectElementView.php     |  2 --
 .../View/Mail/Html/Element/TextareaElementView.php   |  2 --
 .../View/Mail/Html/Element/TextlineElementView.php   |  2 --
 .../sysext/form/Classes/View/Mail/Html/HtmlView.php  |  2 --
 typo3/sysext/form/Classes/View/Mail/MailView.php     |  2 --
 .../View/Mail/Plain/Element/AbstractElementView.php  |  2 --
 .../View/Mail/Plain/Element/CheckboxElementView.php  |  2 --
 .../Mail/Plain/Element/CheckboxGroupElementView.php  |  2 --
 .../View/Mail/Plain/Element/ContainerElementView.php |  2 --
 .../View/Mail/Plain/Element/FieldsetElementView.php  |  2 --
 .../Mail/Plain/Element/FileuploadElementView.php     |  2 --
 .../View/Mail/Plain/Element/HiddenElementView.php    |  2 --
 .../View/Mail/Plain/Element/OptgroupElementView.php  |  2 --
 .../View/Mail/Plain/Element/OptionElementView.php    |  2 --
 .../View/Mail/Plain/Element/RadioElementView.php     |  2 --
 .../Mail/Plain/Element/RadioGroupElementView.php     |  2 --
 .../View/Mail/Plain/Element/SelectElementView.php    |  2 --
 .../View/Mail/Plain/Element/TextareaElementView.php  |  2 --
 .../View/Mail/Plain/Element/TextlineElementView.php  |  2 --
 .../form/Classes/View/Mail/Plain/PlainView.php       |  2 --
 .../form/Classes/View/Wizard/AbstractWizardView.php  |  2 --
 .../form/Classes/View/Wizard/LoadWizardView.php      |  2 --
 .../form/Classes/View/Wizard/SaveWizardView.php      |  2 --
 typo3/sysext/form/Classes/View/Wizard/WizardView.php |  2 --
 .../form/Tests/Unit/Filter/AlphabeticFilterTest.php  |  2 --
 .../Tests/Unit/Filter/AlphanumericFilterTest.php     |  2 --
 .../Tests/Unit/PostProcess/PostProcessorTest.php     |  2 --
 .../Unit/Validation/AlphabeticValidatorTest.php      |  2 --
 .../Unit/Validation/AlphanumericValidatorTest.php    |  2 --
 .../Tests/Unit/Validation/BetweenValidatorTest.php   |  2 --
 .../form/Tests/Unit/Validation/DateValidatorTest.php |  2 --
 .../Tests/Unit/Validation/DigitValidatorTest.php     |  2 --
 .../Tests/Unit/Validation/EmailValidatorTest.php     |  2 --
 .../Tests/Unit/Validation/EqualsValidatorTest.php    |  2 --
 .../Validation/FileAllowedTypesValidatorTest.php     |  2 --
 .../Unit/Validation/FileMaximumSizeValidatorTest.php |  2 --
 .../Unit/Validation/FileMinimumSizeValidatorTest.php |  2 --
 .../Tests/Unit/Validation/FloatValidatorTest.php     |  2 --
 .../Unit/Validation/GreaterThanValidatorTest.php     |  2 --
 typo3/sysext/form/Tests/Unit/Validation/Helper.php   |  2 --
 .../Tests/Unit/Validation/InArrayValidatorTest.php   |  2 --
 .../Tests/Unit/Validation/IntegerValidatorTest.php   |  2 --
 .../form/Tests/Unit/Validation/IpValidatorTest.php   |  2 --
 .../Tests/Unit/Validation/LengthValidatorTest.php    |  2 --
 .../Tests/Unit/Validation/LessThanValidatorTest.php  |  2 --
 .../Tests/Unit/Validation/RegExpValidatorTest.php    |  2 --
 .../Tests/Unit/Validation/RequiredValidatorTest.php  |  2 --
 .../form/Tests/Unit/Validation/UriValidatorTest.php  |  2 --
 .../Authentication/FrontendUserAuthtenication.php    |  2 --
 .../ConditionMatching/ConditionMatcher.php           |  2 --
 .../ContentObjectGetDataHookInterface.php            |  2 --
 .../ContentObjectGetImageResourceHookInterface.php   |  2 --
 ...ContentObjectGetPublicUrlForFileHookInterface.php |  2 --
 .../ContentObjectGetSingleHookInterface.php          |  2 --
 .../ContentObjectPostInitHookInterface.php           |  2 --
 .../Classes/ContentObject/ContentObjectRenderer.php  |  2 --
 .../ContentObjectStdWrapHookInterface.php            |  2 --
 .../Classes/ContentObject/FileLinkHookInterface.php  |  2 --
 .../ContentObject/Menu/AbstractMenuContentObject.php |  2 --
 .../Menu/AbstractMenuFilterPagesHookInterface.php    |  1 -
 .../Menu/GraphicalMenuContentObject.php              |  2 --
 .../ContentObject/Menu/GraphicalMenuFoldout.php      |  2 --
 .../ContentObject/Menu/GraphicalMenuLayers.php       |  2 --
 .../ContentObject/Menu/ImageMenuContentObject.php    |  2 --
 .../Menu/JavaScriptMenuContentObject.php             |  2 --
 .../ContentObject/Menu/TextMenuContentObject.php     |  2 --
 .../Classes/ContentObject/Menu/TextMenuLayers.php    |  2 --
 .../frontend/Classes/ContentObject/TableRenderer.php |  2 --
 .../Classes/Controller/ExtDirectEidController.php    |  1 -
 .../Classes/Controller/PageInformationController.php |  2 --
 .../Classes/Controller/ShowImageController.php       |  2 --
 .../Controller/TranslationStatusController.php       |  2 --
 .../Controller/TypoScriptFrontendController.php      |  2 --
 .../sysext/frontend/Classes/Hooks/FrontendHooks.php  |  2 --
 .../sysext/frontend/Classes/Hooks/MediaItemHooks.php |  2 --
 .../Classes/Hooks/TreelistCacheUpdateHooks.php       |  2 --
 typo3/sysext/frontend/Classes/Imaging/GifBuilder.php |  2 --
 .../MediaWizard/MediaWizardProviderInterface.php     |  2 --
 .../frontend/Classes/Page/FramesetRenderer.php       |  2 --
 typo3/sysext/frontend/Classes/Page/PageGenerator.php |  2 --
 .../sysext/frontend/Classes/Page/PageRepository.php  |  2 --
 .../Page/PageRepositoryGetPageHookInterface.php      |  2 --
 .../PageRepositoryGetPageOverlayHookInterface.php    |  2 --
 .../PageRepositoryGetRecordOverlayHookInterface.php  |  2 --
 .../frontend/Classes/Plugin/AbstractPlugin.php       |  2 --
 .../frontend/Classes/Utility/CompressionUtility.php  |  2 --
 typo3/sysext/frontend/Classes/Utility/EidUtility.php |  2 --
 .../sysext/frontend/Classes/View/AdminPanelView.php  |  2 --
 .../Classes/View/AdminPanelViewHookInterface.php     |  2 --
 .../ConditionMatching/ConditionMatcherTest.php       |  2 --
 .../Unit/ContentObject/ContentObjectRendererTest.php |  2 --
 .../Menu/AbstractMenuContentObjectTest.php           |  2 --
 .../Controller/TypoScriptFrontendControllerTest.php  |  2 --
 .../Tests/Unit/Page/CacheHashCalculatorTest.php      |  2 --
 .../frontend/Tests/Unit/Page/PageRepositoryTest.php  |  2 --
 .../frontend/Tests/Unit/View/AdminPanelViewTest.php  |  2 --
 .../Classes/Controller/PageFunctionsController.php   |  2 --
 .../Controller/WebFunctionWizardsBaseController.php  |  2 --
 typo3/sysext/impexp/classes/Clickmenu.php            |  2 --
 .../classes/Controller/ImportExportController.php    |  2 --
 .../classes/Controller/ModuleFunctionController.php  |  2 --
 typo3/sysext/impexp/classes/ImportExport.php         |  2 --
 typo3/sysext/impexp/classes/LocalPageTree.php        |  2 --
 .../sysext/impexp/classes/Task/ImportExportTask.php  |  2 --
 .../Classes/Controller/IndexedPagesController.php    |  2 --
 .../Controller/IndexingStatisticsController.php      |  2 --
 .../Classes/Controller/ModuleController.php          |  2 --
 .../Classes/Controller/SearchFormController.php      |  2 --
 .../indexed_search/Classes/Example/CrawlerHook.php   |  2 --
 .../indexed_search/Classes/Example/PluginHook.php    |  2 --
 .../indexed_search/Classes/FileContentParser.php     |  2 --
 .../indexed_search/Classes/Hook/CrawlerFilesHook.php |  2 --
 .../indexed_search/Classes/Hook/CrawlerHook.php      |  2 --
 .../Classes/Hook/MysqlFulltextIndexHook.php          |  2 --
 .../Classes/Hook/TypoScriptFrontendHook.php          |  2 --
 typo3/sysext/indexed_search/Classes/Indexer.php      |  2 --
 typo3/sysext/indexed_search/Classes/Lexer.php        |  2 --
 .../Classes/Utility/IndexedSearchUtility.php         |  2 --
 .../sysext/indexed_search/Tests/Unit/IndexerTest.php |  2 --
 .../info/Classes/Controller/InfoModuleController.php |  2 --
 .../InfoPageTyposcriptConfigController.php           |  2 --
 .../Classes/CheckTheDatabaseHookInterface.php        |  2 --
 .../Controller/InstallToolModuleController.php       |  2 --
 .../Classes/CoreUpdates/LocalConfigurationUpdate.php |  2 --
 typo3/sysext/install/Classes/InstallBootstrap.php    |  2 --
 typo3/sysext/install/Classes/Installer.php           |  2 --
 .../install/Classes/Report/InstallStatusReport.php   |  2 --
 typo3/sysext/install/Classes/Session.php             |  2 --
 typo3/sysext/install/Classes/Sql/SchemaMigrator.php  |  2 --
 .../Classes/Updates/FilemountUpdateWizard.php        |  1 -
 .../install/Classes/Updates/InitUpdateWizard.php     |  1 -
 .../Classes/Updates/InstallerProcessInterface.php    |  2 --
 .../install/Classes/Updates/TceformsUpdateWizard.php |  1 -
 .../Classes/Updates/TtContentUploadsUpdateWizard.php |  1 -
 typo3/sysext/install/Tests/Unit/InstallToolTest.php  |  2 --
 .../lang/Classes/ClearLanguageCacheMenuItem.php      |  2 --
 .../lang/Classes/Controller/LanguageController.php   |  2 --
 typo3/sysext/lang/Classes/Domain/Model/Extension.php |  2 --
 typo3/sysext/lang/Classes/Domain/Model/Language.php  |  2 --
 .../Classes/Domain/Model/LanguageSelectionForm.php   |  2 --
 .../Classes/Domain/Model/UpdateTranslationForm.php   |  2 --
 .../Domain/Repository/ExtensionRepository.php        |  2 --
 .../Classes/Domain/Repository/LanguageRepository.php |  2 --
 typo3/sysext/lang/Classes/Exception/Lang.php         |  2 --
 typo3/sysext/lang/Classes/Exception/Ter.php          |  2 --
 typo3/sysext/lang/Classes/Exception/XmlParser.php    |  2 --
 typo3/sysext/lang/Classes/LanguageCacheClearer.php   |  2 --
 typo3/sysext/lang/Classes/LanguageService.php        |  2 --
 typo3/sysext/lang/Classes/Utility/Connection/Ter.php |  2 --
 .../Classes/View/Language/CheckTranslationJson.php   |  2 --
 .../Classes/View/Language/UpdateTranslationJson.php  |  2 --
 .../Be/FormEngineBasedCheckboxGroupViewHelper.php    |  2 --
 .../Classes/ViewHelpers/Be/SpriteIconViewHelper.php  |  2 --
 .../lang/Tests/Unit/Domain/Model/ExtensionTest.php   |  2 --
 .../Unit/Domain/Model/LanguageSelectionFormTest.php  |  2 --
 .../lang/Tests/Unit/Domain/Model/LanguageTest.php    |  2 --
 .../Unit/Domain/Model/UpdateTranslationFormTest.php  |  2 --
 typo3/sysext/lowlevel/Classes/AdminCommand.php       |  2 --
 .../sysext/lowlevel/Classes/CleanFlexformCommand.php |  2 --
 typo3/sysext/lowlevel/Classes/CleanerCommand.php     |  2 --
 .../lowlevel/Classes/DeletedRecordsCommand.php       |  2 --
 typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php |  2 --
 typo3/sysext/lowlevel/Classes/LostFilesCommand.php   |  2 --
 .../sysext/lowlevel/Classes/MissingFilesCommand.php  |  2 --
 .../lowlevel/Classes/MissingRelationsCommand.php     |  2 --
 .../sysext/lowlevel/Classes/OrphanRecordsCommand.php |  2 --
 typo3/sysext/lowlevel/Classes/RteImagesCommand.php   |  2 --
 typo3/sysext/lowlevel/Classes/SyslogCommand.php      |  2 --
 .../sysext/lowlevel/Classes/Utility/ArrayBrowser.php |  2 --
 typo3/sysext/lowlevel/Classes/VersionsCommand.php    |  2 --
 .../lowlevel/Classes/View/ConfigurationView.php      |  2 --
 .../lowlevel/Classes/View/DatabaseIntegrityView.php  |  2 --
 .../lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php |  2 --
 .../Classes/Controller/OpendocsController.php        |  2 --
 typo3/sysext/openid/Classes/OpenidService.php        |  2 --
 typo3/sysext/openid/Classes/OpenidStore.php          |  2 --
 .../Classes/Controller/PermissionAjaxController.php  |  2 --
 .../Controller/PermissionModuleController.php        |  2 --
 typo3/sysext/perm/mod1/perm.js                       |  2 --
 .../recordlist/Classes/Browser/ElementBrowser.php    |  2 --
 .../Classes/Controller/ElementBrowserController.php  |  2 --
 .../Controller/ElementBrowserFramesetController.php  |  2 --
 typo3/sysext/recordlist/Classes/RecordList.php       |  2 --
 .../RecordList/AbstractDatabaseRecordList.php        |  2 --
 .../Classes/RecordList/DatabaseRecordList.php        |  2 --
 .../Classes/RecordList/RecordListHookInterface.php   |  2 --
 .../Classes/Controller/DeletedRecordsController.php  |  2 --
 .../Classes/Controller/RecyclerAjaxController.php    |  2 --
 .../Classes/Controller/RecyclerModuleController.php  |  2 --
 .../recycler/Classes/Domain/Model/DeletedRecords.php |  2 --
 .../sysext/recycler/Classes/Domain/Model/Tables.php  |  2 --
 .../recycler/Classes/Utility/RecyclerUtility.php     |  2 --
 typo3/sysext/recycler/res/js/t3_recycler.js          |  2 --
 .../reports/Classes/Controller/ReportController.php  |  2 --
 .../Classes/Report/Status/ConfigurationStatus.php    |  2 --
 .../reports/Classes/Report/Status/SecurityStatus.php |  2 --
 .../sysext/reports/Classes/Report/Status/Status.php  |  2 --
 .../reports/Classes/Report/Status/SystemStatus.php   |  2 --
 .../reports/Classes/Report/Status/Typo3Status.php    |  2 --
 .../Report/Status/WarningMessagePostProcessor.php    |  2 --
 typo3/sysext/reports/Classes/ReportInterface.php     |  2 --
 typo3/sysext/reports/Classes/Status.php              |  2 --
 .../reports/Classes/StatusProviderInterface.php      |  2 --
 .../reports/Classes/Task/SystemStatusUpdateTask.php  |  2 --
 .../SystemStatusUpdateTaskNotificationEmailField.php |  2 --
 .../Classes/ViewHelpers/ActionMenuItemViewHelper.php |  2 --
 .../reports/Classes/ViewHelpers/IconViewHelper.php   |  2 --
 .../rsaauth/Classes/Backend/AbstractBackend.php      |  2 --
 .../rsaauth/Classes/Backend/BackendFactory.php       |  2 --
 .../rsaauth/Classes/Backend/CommandLineBackend.php   |  2 --
 typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php  |  2 --
 typo3/sysext/rsaauth/Classes/BackendWarnings.php     |  2 --
 .../rsaauth/Classes/Hook/FrontendLoginHook.php       |  2 --
 typo3/sysext/rsaauth/Classes/Hook/LoginFormHook.php  |  2 --
 typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php  |  2 --
 typo3/sysext/rsaauth/Classes/Keypair.php             |  2 --
 typo3/sysext/rsaauth/Classes/RsaAuthService.php      |  2 --
 .../rsaauth/Classes/Storage/AbstractStorage.php      |  2 --
 .../rsaauth/Classes/Storage/SessionStorage.php       |  2 --
 .../sysext/rsaauth/Classes/Storage/SplitStorage.php  |  2 --
 .../rsaauth/Classes/Storage/StorageFactory.php       |  2 --
 typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php     |  2 --
 .../Classes/Controller/BrowseLinksController.php     |  2 --
 .../Classes/Controller/SelectImageController.php     |  2 --
 typo3/sysext/rtehtmlarea/Classes/FolderTree.php      |  2 --
 typo3/sysext/rtehtmlarea/Classes/ImageFolderTree.php |  2 --
 typo3/sysext/rtehtmlarea/Classes/PageTree.php        |  2 --
 typo3/sysext/rtehtmlarea/Classes/SelectImage.php     |  2 --
 typo3/sysext/saltedpasswords/Classes/Autoloader.php  |  2 --
 .../Classes/Evaluation/BackendEvaluator.php          |  2 --
 .../saltedpasswords/Classes/Evaluation/Evaluator.php |  2 --
 .../Classes/Evaluation/FrontendEvaluator.php         |  2 --
 .../saltedpasswords/Classes/Salt/AbstractSalt.php    |  2 --
 .../saltedpasswords/Classes/Salt/BlowfishSalt.php    |  2 --
 .../sysext/saltedpasswords/Classes/Salt/Md5Salt.php  |  2 --
 .../saltedpasswords/Classes/Salt/PhpassSalt.php      |  2 --
 .../saltedpasswords/Classes/Salt/SaltFactory.php     |  2 --
 .../saltedpasswords/Classes/Salt/SaltInterface.php   |  2 --
 .../Classes/SaltedPasswordService.php                |  2 --
 .../Classes/Task/BulkUpdateFieldProvider.php         |  2 --
 .../saltedpasswords/Classes/Task/BulkUpdateTask.php  |  2 --
 .../Utility/ExtensionManagerConfigurationUtility.php |  2 --
 .../Classes/Utility/SaltedPasswordsUtility.php       |  2 --
 .../Tests/Unit/Evaluation/EvaluatorTest.php          |  2 --
 .../Tests/Unit/Salt/BlowfishSaltTest.php             |  2 --
 .../saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php  |  2 --
 .../Tests/Unit/Salt/PhpassSaltTest.php               |  2 --
 .../Tests/Unit/Salt/SaltFactoryTest.php              |  2 --
 .../Unit/Utility/SaltedPasswordsUtilityTest.php      |  2 --
 .../Classes/AdditionalFieldProviderInterface.php     |  2 --
 .../Classes/Controller/SchedulerModuleController.php |  2 --
 .../scheduler/Classes/CronCommand/CronCommand.php    |  2 --
 .../Classes/CronCommand/NormalizeCommand.php         |  2 --
 typo3/sysext/scheduler/Classes/Example/SleepTask.php |  2 --
 .../Example/SleepTaskAdditionalFieldProvider.php     |  2 --
 typo3/sysext/scheduler/Classes/Example/TestTask.php  |  2 --
 .../Example/TestTaskAdditionalFieldProvider.php      |  2 --
 typo3/sysext/scheduler/Classes/Execution.php         |  2 --
 .../scheduler/Classes/FailedExecutionException.php   |  2 --
 .../scheduler/Classes/ProgressProviderInterface.php  |  2 --
 typo3/sysext/scheduler/Classes/Scheduler.php         |  2 --
 typo3/sysext/scheduler/Classes/Task/AbstractTask.php |  2 --
 ...eworkGarbageCollectionAdditionalFieldProvider.php |  2 --
 .../Task/CachingFrameworkGarbageCollectionTask.php   |  2 --
 .../scheduler/Classes/Task/FileIndexingTask.php      |  2 --
 ...yclerGarbageCollectionAdditionalFieldProvider.php |  2 --
 .../Classes/Task/RecyclerGarbageCollectionTask.php   |  2 --
 ...TableGarbageCollectionAdditionalFieldProvider.php |  2 --
 .../Classes/Task/TableGarbageCollectionTask.php      |  2 --
 .../Controller/SchedulerModuleControllerTest.php     |  2 --
 .../Tests/Unit/CronCommand/CronCommandTest.php       |  2 --
 .../Tests/Unit/CronCommand/NormalizeCommandTest.php  |  2 --
 .../Task/CachingFrameworkGarbageCollectionTest.php   |  2 --
 .../sysext/scheduler/cli/scheduler_cli_dispatch.php  |  2 --
 .../Classes/Controller/SetupModuleController.php     |  2 --
 .../statictemplates/media/scripts/fe_adminLib.inc    |  2 --
 .../statictemplates/media/scripts/plaintextLib.inc   |  2 --
 .../statictemplates/media/scripts/wapversionLib.inc  |  2 --
 .../statictemplates/media/scripts/xmlversionLib.inc  |  2 --
 .../sv/Classes/AbstractAuthenticationService.php     |  2 --
 typo3/sysext/sv/Classes/AuthenticationService.php    |  2 --
 typo3/sysext/sv/Classes/LoginFormHook.php            |  2 --
 .../sysext/sv/Classes/Report/ServicesListReport.php  |  2 --
 typo3/sysext/sys_action/Classes/ActionList.php       |  2 --
 typo3/sysext/sys_action/Classes/ActionTask.php       |  2 --
 .../sysext/sys_action/Classes/ActionToolbarMenu.php  |  2 --
 .../Classes/Domain/Repository/SysNoteRepository.php  |  2 --
 .../sysext/sys_note/Classes/Hook/InfoModuleHook.php  |  2 --
 typo3/sysext/sys_note/Classes/Hook/PageHook.php      |  2 --
 .../sysext/sys_note/Classes/Hook/RecordListHook.php  |  2 --
 typo3/sysext/sys_note/Classes/SysNoteRenderer.php    |  2 --
 .../Classes/ViewHelpers/EditLinkViewHelper.php       |  2 --
 .../t3editor/Classes/TypoScriptReferenceLoader.php   |  1 -
 .../Classes/Controller/TaskModuleController.php      |  2 --
 typo3/sysext/taskcenter/Classes/TaskInterface.php    |  2 --
 typo3/sysext/taskcenter/Classes/TaskStatus.php       |  2 --
 .../TypoScriptConfigHelpModuleController.php         |  2 --
 ...TemplateObjectBrowserModuleFunctionController.php |  2 --
 .../Classes/Controller/ViewModuleController.php      |  2 --
 .../CreatePagesWizardModuleFunctionController.php    |  2 --
 .../Classes/View/SortPagesWizardModuleFunction.php   |  2 --
 typo3/wizard_tsconfig.php                            |  2 --
 1087 files changed, 2175 deletions(-)

diff --git a/index.php b/index.php
index fdf42ab54e10..df538e319b78 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 e4233b0acd5e..033e8509ecd3 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 1643dfc4257f..58c43cfc1ed6 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 beafd2511d11..92a86e7c85e7 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 367766af5afb..9847aa262440 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 ec0e58456c28..61e23587f37a 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 5398ae583188..0eaec1d1d5e6 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 17104daf46cd..c897fc325fba 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 b4f3df21dd57..490c2b1f781e 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 3efe424547f9..f5546c32f4ac 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 ddc1b248b64d..b5accaadcc14 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 878fc5e7b506..97fb7d0dc439 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 6110c4078610..1b4cd85bba4f 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 7f221e4b60d6..698e85429145 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 97c11b17e0aa..d8db4ddd2046 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 126e7d9b6db6..e9deebc56909 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 3a73850dfe62..d97899f40323 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 bec6ca067d9b..ce567cac4ca4 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 c83574c5941e..c2b917c3c847 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 d4975fbc98f0..f9ceb6f9121e 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 3470f5a3e96a..dc974c8b9ac7 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 cf1160a1dd4f..d5adf53ccabf 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 210531efc41d..81fe63b1de4e 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 978ae49191fc..12640ccbb720 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 2bc843f3859b..70053f51ea66 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 7b36f7605870..3f90938209ae 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 d78d1b15a9d2..4cf7fd1341d5 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 7fec459e0d62..7da136edc719 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 b13bf5ba7d29..4da00dcdc875 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 b8c395a48654..f8d1af8d1711 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 65c04569daee..e178286f8dbd 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 8f17c3d11226..b234e1ef05f4 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 31c3dc4acdf9..6619dd27acdf 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 7630fac5c60e..93f75aa9d555 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 c22ea7443522..95357f3b6fcd 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 6d15d467effc..76e9070be4a2 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 79a21b120ed2..dcb32dc58c55 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 1e9c4818bb82..f4892f19d102 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 d46330914144..6f1ff02c408e 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 21d511c4e9c8..34988b76bb43 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 766ce70a2b50..ea7e5d7ab285 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 104ac73bed73..bf6460f7e5f4 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 911b733b5159..26d47d04f544 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 03153cd4426b..c3c2610d432f 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 669fd2842372..3e20fb226b61 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 4153b5d59456..76e0bb67e17e 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 35ebe6b32c9c..e5e1a684085b 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 c79cf343b261..066868d35bb0 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 68399c81aec7..f5e1d1fb4114 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 bf3d1f78bdc7..a210afd1cb9f 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 f17c1b0feffc..ab876f8c6295 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 8b961e0c97be..ae520148acc8 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 9b2c99aaa4c8..c982f8d9c9e8 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 09df0d767525..ab6ad93a16ba 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 1fcc2528c90e..51e77c34ed13 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 6cc7560cf9c7..c7487c743fca 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 168941dad6df..bd3da77e5f8f 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 9a2835d40439..551da0bbd2e8 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 3b88d309c9ab..5668c00c097f 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 c2d1e5f3bf2d..c7c2b9c0b2b9 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 722d58df7b03..c66dc296c516 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 bff488d53e4a..38054528020d 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 86b6ecc29c72..ba8296f3f0cd 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 a37dd4e1a3ae..5ae81e6fed1a 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 e7acc9bc4afa..094ebb72cbe1 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 7a2a7188b985..d2754deef141 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 ad3938e5385b..b80f25cc81d6 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 ebf1640aa629..be1d66e8cfce 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 454652743ab8..fed7acac2e87 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 d17cca191d3d..d713a30bcc71 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 7d4df68da2be..5f02742e6d4c 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 68de078ff73d..cc150bc238bc 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 9d9f746caf02..a25cf8982e52 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 925ba2da9be3..6a44b4700169 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 210dedab8962..f0d1439a8fd3 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 ad613d278826..f3e9bfd46a5c 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 748635ee7d3d..a5207b6986ea 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 7d8e8cd5152b..6ef469c21423 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 50c71f6443bc..a10a0c9d21b9 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 21faf0f658c6..7fbe7352f274 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 ffe410464b4f..62adabeb8c7d 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 511584df586f..250ff502ba30 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 8e1f114390b7..ba3b3ea46c6e 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 7a32a74ee75d..4603ba64d4cd 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 bb6c6a3dd5a0..8a930a30def8 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 ea40ce7baea4..96db8bd8d464 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 5af791501921..df4bb505937b 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 9048345391ac..16a9da9c3f3c 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 13af00aced50..1a058a68c1a0 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 87b8869ceb3b..9acfe0bbc913 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 96dc466c2705..905b7fac66ea 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 2a9277ee7a1d..55d8c4e29a59 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 e9f02bea48f1..45b33e824565 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 47c3f5d77e13..438df8aa6cc2 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 7328208b80de..fdd4232807e9 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 473610269b66..4e75396497c7 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 33cc5f2cb31e..848e557a0406 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 c07a26e9a7fc..fd441100f3ef 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 42d96f8698f0..47879694b7b2 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 cb668887a48f..252eca2c0da0 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 0137e5f3a26c..a1cc5b1f7d6c 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 8cd47d553ba8..f41d4a39680f 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 8b8b61fa9228..010efd9853cb 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 f7236194b1a6..5aec2e42f168 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 dde7fb424129..7e84f1be9ed8 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 48e914f249c8..9dcd87a43570 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 80703b5a819b..38b3151055d1 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 e6264df65f1e..f460c807a048 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 5d05e2b3e5e3..bfa703e0d0d3 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 df265bc254cf..2d8ba577a3d8 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 2b36812aa44d..167fff068880 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 f5f692dbb948..f9aa203f26d0 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 a6f729a40a65..0a369f5641f8 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 9de8ad3c3d94..ebbc1e41f7c9 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 9adbed6300e9..0fc7d6483a42 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 51ed75bad655..0c98b1f2899f 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 b29e5e270c52..bb15905c3581 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 27b11b2d27a4..2ac86aeda6f5 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 24dad4895cb0..e2fc3c3a87f4 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 890bc0514ca7..7f59e34afcda 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 b39ba19f35a7..ab4f578a2c2f 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 2976c10b301f..a03c53906ec9 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 8f49462557fc..c040815bde76 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 35c99d06cc54..2f0dfb89c614 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 f0d570ad0922..b924107b179e 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 8999973ce6fa..e9d275788af7 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 d0b8265f05fb..2056c92e6672 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 5cc828d11a62..71bd4870d952 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 5f84a423abc3..506133ff4176 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 e86c35ebb2dd..6bd052eab841 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 d8ca01bf85a2..563638098bb8 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 69372452c165..cc8219891188 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 4f1821ea3ff9..3e8c3df56f2a 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 1b94a7c623d7..458d8eef29b1 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 1f98afe82a28..4d719a4bb14c 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 53a273e3e04f..c624b024e7bb 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 54ecc7b8b15b..c78960248b7e 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 02e7cf439caa..460adf8173f0 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 826f60e45d02..2c034c82b663 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 9d2bc44149bc..4456dc9e5284 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 e2b48088663c..1e4073ca8ed1 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 81afcc88fa11..434e3ecc9692 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 99546f81dda5..892128b535a5 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 56906d8bdf69..9a63f5e1e7b7 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 3b03638dc37d..cfcc2406be93 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 9118097df572..f97b1611a7da 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 39c454fd45af..b3e44b207484 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 68ffd086616c..2f64aef3e824 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 c3b7ebce0d26..c4684fb0267e 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 7492ce7b945c..eaf49421a8a2 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 e1066f553e37..04654abea2cf 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 9fc2637df335..566d926487ad 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 48db1c2badb6..80e9b16c2cba 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 224828e8088c..cd277bebb876 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 7a9bc34a23fb..ae05abcac523 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 f22cd54bbcde..dcc0509cd877 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 fb1f3231ef0b..1a421bef2cee 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 a304505c9081..80cc9bd759a7 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 6e38e9aaeb63..a6225a1163ff 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 3ed558592326..3d0506f833c2 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 b6ffb867cf95..2aa7251a27e7 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 0bea30845cf4..e26f7e0fc4c6 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 25330512d365..10846b4b1e22 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 e5774237a738..fd9f4d3f0bd1 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 f07a54d3cca0..577d9b94565c 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 a3831bcfd697..cc6f3ed3eacd 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 999817916e75..e9d0ba746ccb 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 c893906ab171..05bed751677c 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 5624a3f771a1..be25e4466cf8 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 c3e013d8a37e..715f378fc27a 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 02f96c583bcc..fa6eaf21c71a 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 fba14fbb602f..46e8d34e098f 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 9a2bbfac6800..2cd8ccf43d2a 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 3e2ae2f9a58b..3e7339d89617 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 4986e9f33ae3..8a62dca592b1 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 327e1f717e0b..a1b5eeb078c5 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 c9010d0558ce..763c8d022d99 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 a28a6de00260..35f5baf62975 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 12a51fa02815..ca6c1f877e48 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 de2153378cd1..dd0754268f99 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 85258fc1ef5e..776dd3af7a61 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 5758e9e790c5..f36e653fd182 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 7aa5362befd5..cfb58ad27d83 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 c3b00b862607..611d19f8a7c9 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 2f3255da2dbf..ac4288787f58 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 947fe1187361..0fd3c63ed25c 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 b74eadea6e7f..4889d906d539 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 d869c0f8c56b..e846ed4dc7c7 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 72650b4400eb..74a5c266a806 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 9dc85183f115..0021110707eb 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 c33dc4f7babb..34fc49794a0f 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 9fac587ac289..629f242f5c5e 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 56cdbcbd8d4c..9dddcf6ee30a 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 961bd705a29b..8dd8ac401ba5 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 2d2f2212199d..ca050136495a 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 7fd8553dfe8d..5a41e5bd18ca 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 11dcc509710e..3196632873ba 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 056fe0ed0b7c..6ff9d48c514a 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 922044147b16..e2d5d62b1fe4 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 af0093b1da76..7f0b5d167552 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 e01519dbd5d4..a147cfbaa220 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 26ee66cc5f0e..26f9a5402bc1 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 eb63a2097fc8..b86c71198622 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 3ca7608b51ac..2a11e5c77fd0 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 f3780da83ec2..2b9f03ee4b84 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 0b2d2e9562e7..1165a8fd22ec 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 a530be7d6cba..8d4a2874a72b 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 98bc8bc7721b..95fc9262dd04 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 241e6bc90b52..ad5a7ef10a93 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 5496ad5e4720..5d13ce45b1ed 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 2bfe68a9d441..1f85ced66f6e 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 3609b62053fb..36e9a1125c98 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 03f7147c84ef..39324f87cb98 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 bd388d6626b1..98c01dd95ccb 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 3533cc56fdb6..23031f758363 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 e8802a0a75be..a81467b1a6fd 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 587827059c3f..a1705f6af012 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 db26658874bb..37e1385ad5eb 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 da75d3a4b739..c01b508e3add 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 58dc2b37ccd5..6c7cb674ce42 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 2bb2417120b6..3fc25dd1e08b 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 bb6fd5b17a41..66070ba1446c 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 e4eddb6fde56..474f079c3e8b 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 fcff780b7bf3..2207700161e6 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 cabe7b2010b0..9a8fe1c3980e 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 3652dca2d035..64b0918a23b5 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 4eb56ba3c343..a7b2b9e139a9 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 53870df3d3d3..94066ac4b612 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 746dca48d0aa..03996098e03e 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 95db7d067fd2..aa741fdb8e15 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 5df74a7fa224..cb02047543f6 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 6de48ec5583d..3c35945a7ca0 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 76d3dc86751b..848015b52b89 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 8e365e802d70..d8756d0794b4 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 eef765da7dbd..bc7c774ae740 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 69ce90869103..6666a518e6a4 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 35051fac74c0..8fdd21fffdc3 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 2082c48218b2..69528051f4bb 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 f9f1c213b778..5d30bf8934c9 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 ce992a065b96..60f44d2e7d38 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 a42f9e42d322..a260b9f83196 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 b089acb59faa..fe0e515686fa 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 21a3b2e6f005..d224ed5ff1a3 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 264e5958cca0..e6b62d789e01 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 31503df9cd28..9f07446b310b 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 cc20caab1be0..3ec7260d3bc9 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 982a00f80e79..ffef11071c4b 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 5a88d0a1e59c..99081c3e34db 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 f981fa50c075..179b481586f5 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 9d8a166f56cb..0c737045901f 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 36d84b9e004d..1dd14c384c79 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 85141e10d44c..ee7e56f02cdf 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 4abefcc933cc..4c9f47027190 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 f929f385badc..511fcaf5f004 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 e06eb323cf13..abe2528912b4 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 af9d7004a62f..b6a2303a80c1 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 ae07c0c01b60..a7ede19f759d 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 22e92cd12381..d2dc7b56cfbc 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 c48f40ee0bcd..35559cbd00c7 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 19b327485ba7..19c011d459c9 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 467583919308..9bbb02c5dee4 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 f796e371f7ac..e5f325d482ee 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 614285f3e102..f7d98ea53eeb 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 5e31fc781cde..5bbfdc7732b5 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 8786314c08e7..6a4e8c16242e 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 5329708276cd..08b200f450c9 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 3608887956f3..5b3e16eeae5c 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 4e49e95ee286..0ded8a3b0f45 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 63a56535ebb5..72dfc297b31f 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 9f7d4132b745..1318f73e8502 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 af28a9bd40a1..a5b124ea18b5 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 3cd1fc9c0f2d..3a7491bf7caa 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 ee5b7dd3c05f..17fecfbfeafc 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 99d717e6bea9..ced176268a57 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 51c1c4d8b42b..45e8c8495f7e 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 8164d5daf40d..55416ea863be 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 e00f7774ec8d..c04e4e456ab5 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 bdaa7060a810..84488b641727 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 afec8165a444..861ec9f7a9e9 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 292103023db1..d8eaddea9a05 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 8f74697f00c9..be33d813837d 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 0d9188ffe0c6..606eb7068a4d 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 bcd92171bddd..fe3292307bf0 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 a1cd98003559..ad726487058b 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 08886ccd83c0..c46cecbc8045 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 7fb98fa2825d..b3cf64b24341 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 7d0dc34da881..1765e4cd6fae 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 921a08350245..9e8e8f8f5ae5 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 540047c8ca90..a5a0c347655a 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 09358b75acbf..a9562c9dfbef 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 bfd52f976b6b..8e59defb33d2 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 1b5e599b23f5..63b3880a3cbe 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 4e689876fa0c..ecaa4a5eff23 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 9221af18be92..fa349fbe27a4 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 59c638f4425d..9ebd475f45e1 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 70b13277325a..7c2cc389d205 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 e550e7dfdc84..6ce5b6a49347 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 450005772d4b..52e347b5b5c8 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 a0388a962dff..439a4677642b 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 872100da02eb..517ed6dc423d 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 7e304da92e89..04ca7752d7a3 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 273084de03a6..5cab545ccae2 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 53f196cadbbb..d5d845f0663a 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 e35619e267df..427ae212be81 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 9e7760b661a7..32fe298466e8 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 72be55827d3d..de5b5f29fcac 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 7bfae232551a..d411f74b14b2 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 6d32027169d6..6fa72041cc9c 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 067345887b29..c0e30a1e11bf 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 a6f28cb033fc..958724184b4f 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 87849e5aaa1a..84bbf2f970da 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 c25f153c01bb..2550d27d573d 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 24816347ba66..969baba36efc 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 b5d28c30747d..277cae5e6ced 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 8ad875077e10..e1776004e3e2 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 564d2c39b523..3dad2eaf8059 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 4110a2a5785f..ae64a596c01f 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 7d26c884b7f7..f91a854dfa1a 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 fcce41d877b0..c0a03695c1f2 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 595c6559c2fe..2329dde2ea25 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 ef8692c82cbc..2ad94627e9f0 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 be0489f258ed..398e155fcdf7 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 d782f41b2fe2..98d76abbf554 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 2d642590ede6..b1f387a0fe2b 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 34a3f0766af1..909b0b657dd3 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 55fce434af80..052447d76409 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 60a4addc0b41..7195e7a26c87 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 82e24a3acec4..930acce8abd5 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 023e6549a600..97ad0f303628 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 ce4ee9d663b9..073fe17e3d7a 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 ff300cc4f56a..47590757fef2 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 62feb32e8f05..792c1d42abfe 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 2be27762ad65..0493cd0b50b9 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 2f73e3cc72aa..c7749291e0d0 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 a600e8d130f0..d6f98bcdd3b9 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 c86dd75b5a3a..c4e5c1174607 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 7690f4752609..e0812b29ca89 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 2a542bbf4556..dc2882680b7c 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 094560704f6f..b1b38e62fdd6 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 f1e7afead661..bcddf06410ac 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 fc930d8b066a..21916a5482b3 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 7123d8b055ce..22874362d287 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 f4bc8ad9a92e..bc16777e009f 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 4dc8284816c3..50a9d63271f0 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 2096287d78a6..93d5d759f410 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 31ea6b588257..ccc80acfd069 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 ddf6aeffe571..abeefc1fc12b 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 ef8ebf70eb43..b9c311d8a7fb 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 f57bb974d61a..70b1e7ebfca9 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 47d2b9690ae4..676e48ebf2ce 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 1be7253cf3bb..b13134e90d50 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 068753ca1e1b..18e008817efa 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 e97db3e7d0ec..aa358509ff8f 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 074982425670..50b1e727654b 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 1c7125e9187a..25de4a45b664 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 8618e550b072..97402143902c 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 24d3b4614f20..e1cb4b286511 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 1eecf7b06ca5..48f285ce49a2 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 7afa944bb11e..698ec390afe3 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 12d1633500da..cb4e9701b1df 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 bfc288862adf..1afee2a0493c 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 94e34556086b..fc84cbdc4134 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 1b0176515620..dde8cc9e19d5 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 1e528ec886b5..8c864d03a31f 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 f914531ab086..877d80e975e7 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 82feda2fb34e..488ae91c2508 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 0bb3a8004206..4a35c3fdd559 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 5d5008bb110d..0f84d04f0858 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 2fdb233c5a2a..047fe152f86f 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 facd7d41b052..11acdcf728ab 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 880758226a15..f223241cb828 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 a8d83e534fb0..d6ab666a051d 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 c0607d0a40c3..85484639563a 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 431330a15845..883f65906da0 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 aa92d0fa2f41..ea87c55f9b60 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 168bc72b6e65..aae1d9e94924 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 18baff84e4b3..24f602303c0d 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 cdfd91ec8c8d..720cd46fca71 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 0a32e5cc1cd3..1634e66e9338 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 08a9852192a1..8c585aa7e87a 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 2a6cd1f2ccde..0797d84eaf86 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 b8b9ad8a1df0..f61a8e6c5c1b 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 29266d06211d..8e5d3f0b7741 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 cec4b7574685..38894e4cc387 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 14688efb6895..b217fb0f85c9 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 a3acea1e5cd5..dcedec47474d 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 05ec369bbbe6..942442cdf1bb 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 0140774f809a..8688886d384c 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 0462e9b31653..c10d074c97ac 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 c134a9c69757..e5cd39f9280e 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 2bfb1f87edf4..8809d8c65220 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 c67e8f8d1bd2..a134bed12ee7 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 33b3cb588e6b..d1e4311a00bf 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 8d4c15e7753e..fca328e60d83 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 67af2d88d638..470e15a80643 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 251983cfdb2c..a74f1b1d90cf 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 ba99ed754992..60c57dac8550 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 68f3724a30d4..42f025306a52 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 6363ad50f124..b22fa7dc079b 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 527f8cca12f7..57027b943c72 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 1d7f27d09712..69076db773de 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 dec4201322df..b9e2d31ab362 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 14a63a6a85b3..0f7a229b5afc 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 63ac2d3d21e6..5a4774f3d9a7 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 d3a0650c988a..f7041a1720f6 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 adc2ecf87521..e8f550eb811d 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 8c0859679b7a..5c777d060015 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 b4f347072205..05efebc7f2fb 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 7e01815c6a1e..d4ba91550e4a 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 fcdf5f4aa00b..dd95ff7e9f2c 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 90868f61423c..74126266ab6f 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 a7ec2ccfb29e..3c481a43d46c 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 ff8079a1496d..f6415001499e 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 ac6bdcbe43c9..5344e039e412 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 5182cd088191..137ffc124f61 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 3109ad079050..4a07d75b5c88 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 3c8e43f63883..12144a9a1d59 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 63a265b889c7..a07e708ff263 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 32cd142670eb..e0f7e0488875 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 50411f38bdc4..9c2129258d33 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 6e2b443f13f0..5998ab89e000 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 5490741b20bf..50f9f0d415bc 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 1d12ad814362..e888294db624 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 a4ed3ed11a58..bf295dd92fb7 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 c96f071976df..8211ede56972 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 afd130161951..4a05424273fe 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 f69838c2f0fd..8eeac85b049e 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 45d9b29f4053..ed2f2118462a 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 7156ea4ec27a..0b9c597f5975 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 8448d6072a18..27bd33427e1b 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 07993e11e98a..5d0e7d351769 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 30514e89635e..9f66a83517e5 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 f81fee6b760d..ea7fd712b319 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 fb58ed43384e..a20b1ae123af 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 797f031533ec..1d2658e2cb10 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 0769370eaf0a..95a13ad7117b 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 ba6569f0c1a6..12b667ba01ea 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 1bd98a1ccf2b..b011a75d9f08 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 e9291bc7181d..07a93893a9ba 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 75c1057de0f1..a582dd0d7371 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 63d5d13ded7d..583440b97d52 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 1a5fb842bf09..fa405add473e 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 21d6755359db..611c7e4f65a2 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 979efc8c73a6..871ab246289e 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 3c82db238515..42f9e3a7b8ae 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 868d22d26d7f..6c1c274d7a11 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 4563a9c2aaf5..8c087cdeb7c4 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 5e21da909a71..ea5a2aedd2d5 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 a94fe2e5f380..70b84c2cf104 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 59a41b5c5e06..56ab1caac834 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 5c52c42140bf..ac8498566b3d 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 14286e04d40b..3beb27f8e973 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 35141f5f66fe..97da685aedfd 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 0b8d1316deb1..c94d94f3346b 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 4c361d8f4c2f..a73475fcdacf 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 848dc27ec80e..8f062ac61b8f 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 0fbe60cc6886..ee1f0cfaa865 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 1c0d80ca5b41..613647b61b7d 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 9dbc5d5ec4c6..ce3b75b9277b 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 b8e956202156..b313d266c586 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 cf7c42499144..2f7f071de802 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 010bbfc8dd1c..02ce35753c99 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 027dd00fd50d..9dd6a406794c 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 3058b8714317..5c6d604a41e7 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 35bc6204a018..df9d6e0625c6 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 7ece35eb201c..838ae2e5d2d1 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 0f10d6beeef1..83a0e38ad339 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 670bf42773b4..717c88a3d7f4 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 1707a9b8d084..7901c63610e1 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 6221e17a9e02..a2db9997ed5a 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 160c3bd561e5..fe282314edeb 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 d05cb3b1610d..ebe442b65fc8 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 8bf53377892f..9bde6dac0f20 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 573c451b85f4..e25159f5fe39 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 11eadbf33bf1..e5f8cd897b6c 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 265bcc132ac1..5c0c7be60bcb 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 832c70762082..751fab2575aa 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 fa76ef86a0be..71190b244daa 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 1363d714c524..f265158c13de 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 4bf26b93c931..49b875c00aad 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 21db17509a5b..f5ec1bd50ac0 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 ed275a66967b..e409eefcd9cc 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 7c22221905bb..f12dbd393d80 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 e0b5908ad224..4e8cf430008e 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 e62bf730f877..bb53ef63750c 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 75f474026bf9..d3236b6633db 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 68f109800c6b..243569767eb6 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 22a56c80834e..a905b813b9a4 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 35403735c92e..f6425f2bd4a7 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 d2923815c41a..13ec16f3a8bc 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 5eccfe2f9510..e6e8059c34b7 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 fb787452236b..cc19860684bb 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 f5621f735b8d..e39986b6a797 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 1ac0928d0e26..2d5f8517d137 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 48adab7a8446..7317d5edd0e8 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 b5c0dd3a736e..755bbd7bc8bd 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 3dc2e846a8e3..25b028ac7963 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 daa87cdded7b..26dcad96cafb 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 34e39e29de28..9aa0ecbc332d 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 e2d410eddd9d..15b8be8b249d 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 f994e7e4fecc..c7e4240a94e0 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 3d230ee52775..aee89c71608b 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 ee81d720931f..d59af8484501 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 6a55af3bdfa4..36f1f62b06ad 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 1eb8379d1db7..ea4a83665416 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 1dcc89f62b73..9fa262ec9e97 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 fe528325be58..63e76a38d4d6 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 349bc6924644..93753005c674 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 292f66d960e4..2d7db3a8196d 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 33babc4f96e3..f73514bb9e8c 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 0a8110283613..d15596e708c4 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 5dfc012c167d..f9ae712576f3 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 2e70dc85ceba..48c2d5271fee 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 cfc7cf2b20af..6b4db4b2263e 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 9f73546bd26a..c51a4bc6eef9 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 63dbe07e2449..d7df51d5f29a 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 359a3295ef3e..32c92c149d36 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 6682aec453f7..3e29d60d1c4e 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 879eed81c694..2c3bfcd74891 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 c0c7092bebd3..5d0e87b2f24f 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 4ece7c32040c..2b08879054a7 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 2b924bc52a3a..06f7b48d9305 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 1d8cdb3d0c03..ad3e7580ef1c 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 dc91ee53b873..f2f27ea2ae0d 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 e0cf608e81fc..44d2bfb5ad01 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 2f7625b3e01c..a92ab3383850 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 94546088ae95..9a8243a48d76 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 694da55f544a..f14c7a8931ee 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 1f63bd433e89..ab5626e3794a 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 9e5bac2d5f38..c6cda03956e3 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 fdca2b11f824..8a29c9e13529 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 85e2dcf2005d..faf7ffef38fd 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 8d0ce9c4faa9..c477319ba7b8 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 7d6fd00ac91a..bf3667f7e32e 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 00ff51adbdc2..fabb35a0147a 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 9e03f851bae6..8457495ef493 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 dfe42d6002fc..78ab516c39cc 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 03d38e8c5056..d5b2c968bfba 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 3d3bca528a18..a12965521f0c 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 b896813b1a63..32f892ade6b7 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 67fbd19dec11..0332865ce817 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 c14376f08bb1..18ac89f66969 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 b9eefad1b4e0..e167824ce2b4 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 933c81af119e..1f4df7303a78 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 6800dca31c28..3516f14c66a9 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 1b51c67c2998..2df8d3951652 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 76edd8ef55d2..b421c815bdc5 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 b4cc2a3e052d..23f025fe9a8a 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 be4e0d1c410a..1a59da3707cb 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 3cc7ac89f0bc..6aee351c1aed 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 0e8b346356a5..4bc2f24c3a7b 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 2f01e956a786..ed5e768c8fa0 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 310ec64ac4c6..2a6b4c705770 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 da051ce03b92..4d70d3a9a963 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 da6946528e5f..4f8ca2cc66b5 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 f62dd89d50ac..84b8089a8936 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 1362f18ad6e1..493949fb4a45 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 07f0515db2ca..29123fb52624 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 6137fe28e202..8f572cce3216 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 fc7e4691c5e8..d065ae0661ba 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 27b8bb96ec92..38f302b033c5 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 3ddf83d431d5..6f44ae7f9739 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 c8577303ccb6..0b734cd102ba 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 93752194322e..fdb851cbc404 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 0a0dcf482412..aa7d9c9ac2f3 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 2cd0b4a8ef03..3c5d550ddd12 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 e9ca08896d79..dc3168bbab02 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 bc7543628588..d4854752fd0b 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 4b34c9f5c8aa..a0cf6bc5997a 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 583f6c9187ed..5a96478aa3c1 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 dc8cc87160e9..e4f573750ba1 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 d28bedf9d964..d2281ba7d6d1 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 bf7ddf071c63..d4afe5c36d39 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 5ee9ebdb2241..ff7127a4652d 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 06405380c304..7a9024f3e9af 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 9e1ee9c5a801..819b737c58c0 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 3941550c023a..dcf1f683e78e 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 6aaff0ce7e32..57451d15a5a5 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 ff5f1017374a..968e9ed9e29e 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 4224eff8155d..967863eb8989 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 fe2c673cf342..ad4b5e5e33f5 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 bb98451edc54..d461b44a911f 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 7b58dc62b979..b349b5602d3a 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 83af0e4917f3..eef939a61965 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 23590836875e..be3f6aedfe41 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 97dda422d7b7..98175e4f178c 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 8d92b903d146..531b9245985a 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 04603990b408..8bcbf9e1b62e 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 a9f4a5327d67..c7c383ebaac0 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 f6e98a73ec69..989041020911 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 55dd1f04d0bf..28784a99fa85 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 8d809f8cf2c5..1d0fdb3c39d9 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 859465c6bc92..d1db91527e73 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 3851614b87bb..cd9910c82f13 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 d4acd618c8ab..81a261f7dd9c 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 fca2d6997db1..354525ba2a02 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 96dfb60dfd83..fdd8b5944f1c 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 276239c062a5..4b270ff6b914 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 948448759c77..09c5e38b2db5 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 87df8d8a0ca8..47253f925347 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 7a303936eff5..7173a7bba920 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 6b26be06f039..eb08fd1960a1 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 8dc5fc294439..f286439b56d0 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 18ed8f44f7cd..25f821dbc8ad 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 5c18b576c37e..fa1bf4aedd2b 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 beff8cf02981..695316a9a4ab 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 2e1f74569fc7..ee93f6636102 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 2ff3a31768ba..283d19cabec8 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 8a39561b78aa..db578ff3e5a9 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 d20a06d8a0d9..f4eeda65f8b9 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 a5b0b87583b6..66540e5f14d4 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 b7dca947bb80..7e77834c87e7 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 48fae48dd62d..87433089fe3a 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 ec9212627ede..5aa382c70c73 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 5d7685b7592f..f2383eb4b4e6 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 dc1930fc0b0b..9c00cc4e5ecc 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 85f7d514181a..30f57da4a6b8 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 d8f3779b8c20..87326ef4bb1e 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 df3027dd5aa6..caef94910ce9 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 058017c02cdf..40095b5233bd 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 136212426a76..4535378f2d61 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 ec53cb8a1320..dbbc7ebd11bc 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 676c15ab55b3..f8affc7c2aad 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 9f155d3d060d..e15598d7a157 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 47eec149a16c..e7da352d4198 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 33ba088688b7..41899203e330 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 a04ce9a2c32f..f4983f9ac6fa 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 a064a14d452b..68d3d5cd005b 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 949b8b586407..123fb53897e7 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 19f5362647fc..00af68cb205c 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 35ffe2d7ab82..99b346f6c160 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 045660dc7d7f..be712a726f9d 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 4c6dd2f38686..0eb20bb0aa9a 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 1d052961c414..0fca322777df 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 846a132dd803..bbf896f92b5f 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 03de446bf414..28cfd10453a1 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 5d2d4c29e78c..c086910a8702 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 518335d210fd..fbe065601d65 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 02273450b802..10b6d2e19803 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 dd39b26aef9f..3848762c377b 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 6ef1651df187..77630b870c4c 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 cfde2f6c1922..78bbe5fdade7 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 60888caf1eba..b02358b3b518 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 206ba6abba62..435e6b4707b6 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 84269e22a5e5..7ee253b6aafc 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 1c84ab42c1af..aee2e60a94b0 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 e5bba83fab42..30622ced59bd 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 2b7525f0001e..8fb57a00b49d 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 4d100a71ca1b..91651c8e2028 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 801a1db5148c..67c90ff4abdd 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 958752cce35c..c5bcbf9d2663 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 6e30871d20c6..e45e08acd92c 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 35d8b4a51e21..bbd1dcafed9d 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 90f06de61863..55e6e764bbf9 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 3ac4abb3569e..379ead996f10 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 5e2ab907c67c..afa60231a931 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 f3f3466f4a5d..b4816410e249 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 c209ffb613d1..e6decdf5a642 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 152d5507967e..fb866d52bda6 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 acf53bf03e7d..8290a89de468 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 8d770dbdf62c..d8b38fc61450 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 a41887c4aed7..78482f8a7011 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 9b37d129f3b2..fe15b7b7ef5a 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 2f1536c0a239..f0677d6bd2fd 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 d7e6dd20303d..ed24c53ae16f 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 87e4c37533aa..e66ca1102c20 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 0ae7d3a4e858..fa6b8cdff069 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 0add0b0a314d..d34a8d7b2e3e 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 8bd6193f0f9f..875fde70c958 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 590618806b06..f84d059dffdb 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 e0afc7bcf0e1..738cec22965f 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 473e392652e4..4734b9a84260 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 623e2cc6c725..3d16f1378a8a 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 b7bffb081c95..a89e587241db 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 25a184574936..ef8313662516 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 b9016513435c..b0db9c5f0928 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 0ea0b26c71b8..867f266f7c0d 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 c65ce5a41bc5..1ef94768c97f 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 eeba8831ab18..f96f1b4d08dc 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 3e25193f734d..65a17ae6a7e9 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 b8f1417f1a9e..7d2eb75ec9d2 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 c9e33646be91..ce891bd24e10 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 af7fe2fd0e70..b5b45dab88b0 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 b80f8ca51afe..011bcde2f832 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 94024433e146..96256c582ccb 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 965fb5c3925b..728b517fe1a9 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 a29deb58dddc..bd4885f8766e 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 92db9a9f50c7..c219daf39fee 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 ed0d6a8cd5c5..f35e89ade221 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 fa8d2c3e6430..ae56c3c82693 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 2da737e5ae4d..e7cb141bbd95 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 75496a87db81..d5acbf069084 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 977e8565b7c1..7e584416fef9 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 b53fffe3c43b..aa8dcc744c54 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 f857c3690e94..6ba01498417d 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 d851654bb633..2b50e86d7541 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 cd75aa3d0634..c90c8a0e9164 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 287a69a00231..1277ef868b25 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 76de7ff1ffa9..bba8d2eabad0 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 a3c40532dea5..fce7724c4144 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 1b9065792cc1..313fca75d37e 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 81b18d9f0d0c..97e42728bdd2 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 cdab1944b5e9..ec3fcd5d02e1 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 335cc15a30c4..a12de4078074 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 ded6ec453dee..d8b1b6470305 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 64b8ba11e10c..1f02d661224d 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 495c220760fc..086d9c0ce9b4 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 6b6fa5fca4da..c26eafe117fe 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 e57fa4af2608..cfa768cc219a 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 7fe5c02e5014..7ec3b98f2fa6 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 c1f5b361ef77..52b2751ad62d 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 6d29afbe22a9..548400324ecc 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 67f56ae45056..f006e85a878b 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 e408c4982c4f..ee88e22bdc54 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 fec92fbefa26..21cd97063379 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 d7c191114119..cc7f8bccb79f 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 c4044db25da7..38a0aab3abd2 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 5859f1cdc6e9..0b5ccd742fbe 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 87440111d79c..a8b43647e6f5 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 b5de7b4c46b4..80763463ab5e 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 1ad211f31e93..7bcc8b4ed68a 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 68da5075aaa0..a46ff3496f98 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 089f73b9b92b..0d6c60f76228 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 348ffba0535b..49cceba4a2ee 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 53b7caccdb56..fabbfe932c8b 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 172445d74862..8946277d3c05 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 e60fa2e02a99..f9efea16d53a 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 9067e7be497f..11e6bb3b1236 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 99f4fb9584ac..e0685041d490 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 b53504890aea..d9024353894f 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 d03626d05562..5c685c5ccf41 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 d8e9194247a3..42497f791ccd 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 7163d9a65fca..495f25c2606d 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 b4ef88827b4a..35ce86b03d5d 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 4ead106d6f70..fc5253660054 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 fc2aedc933db..0e8e383e4a85 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 4a5dc7bb207a..f53fa4bda34e 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 3e85ee04e384..03ecf7833461 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 081d582d8a47..dbe8b102920a 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 e68d43109593..67ce96956d55 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 68874ab7b1ec..3c24c5483fe9 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 87ff6b27e5f1..b0ddc15fc039 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 f970c35bdbf9..6adb2ab2a6fb 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 ee9d24152e9e..30fdfc4c4282 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 e6fc303c55d1..32da7f40a771 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 0c93b2069bbd..ad7d68eac415 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 213c8234fa0e..3ee46280a3f1 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 0c97a456b730..20d84c31ae52 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 6dad001dbf7b..9713e41d13f0 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 b42ba28e8a72..fd0340f68405 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 a3594197017b..8847a11b8f1b 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 668f02fdf9e0..6ed097ad6375 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 e02b5be78dae..799cada6b61a 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 9bbb8b9a497c..d288ce3066db 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 fa938156a579..9d9e028951a4 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 c5a74f52276c..81416d405b92 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 4f0be049621f..dce07ef25248 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 c6fadce63647..4636427434b8 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 7d101657363f..c39b09ce5850 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 cd15efb33225..28ea6cc31276 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 8ee70a5ea4b6..5cdd15d6ae15 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 dd4552e12863..7e4aab165bdf 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 ebce75413cd3..d572da38e654 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 7cdd4854db4e..a913f3579730 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 d519ad5b6893..0a934b7a165c 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 c4f8c42ab524..9d2ed0aeaa29 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 4475661fd835..360851273e7a 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 7c024f22dbd2..c841ca034d72 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 245c0c693998..f36972b09e9a 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 3c8bbbf11921..07cf87d6e275 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 4f4562d87d98..b32ad04caffc 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 e5f20b96577d..f2ad4d2ac6a1 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 36dfbe5a4e51..688c18ce0011 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 b81459c9d45d..e5cdb7fc3d4d 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 1c0328e7baf8..e6ad541ca25a 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 99b689231bda..9ca1c74a10a9 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 ef266cbbe9d9..0bb98f438b8f 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 580f2a49b988..a1f2b990d7fe 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 ab4a99b22c13..c5ba30f1f514 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 bd65aba8bdfd..dbf7e4cae5d8 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 7c1e9e472687..ba869a934e14 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 1368499e2089..3c3289ee8966 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 3e30cdbe5831..55c9d0122df2 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 18a0fae237aa..85f1ed710454 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 319c366139eb..8c6a68adf9a9 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 63d8ecc459f3..bf37c2a54636 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 86fa2ab9aeff..ae783c3ce070 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 159293c395e9..77a40ed8fa2e 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 5b4a9d83b35c..f6632d46dbc7 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 694a0963d1a4..0c6931f2a294 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 35642fb57f01..4b3ea0840948 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 c0720e97fc08..a5b65d718360 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 c223a5073e2f..f4ffd04cf87b 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 e53d47885f9b..9c2387d85b78 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 f0fb89b0bfb3..3a8de5a194c5 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 7842e37b937c..5138cce4f193 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 8cee298c4f75..d330277a80bc 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 138e7381c630..09172d8d8783 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 90dda15e8f96..7ace70dacac3 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 a8532cb32208..b411988a7e9d 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 b24cdea35a29..5c657af95f44 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 ac53b8387d78..288ee2d89b89 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 2ed158bee628..965280ff4df0 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 5d45f9cd4173..c57c4ac353b7 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 34929f3b3e8d..05e3a99e12e6 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 195779f9505e..489b90cd59ad 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 6a0104fd2355..423302c9d8f3 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 8a598cb4df5b..fc2482fd09a5 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 08efedf6c315..61ac71414216 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 ffbea94619e2..770583be4cdb 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 d7165caa5f9a..5ab39719b1ac 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 d6c02017805e..b2902a5d5a18 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 b2dba2961ef7..a80274a4861c 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 d77025ed974e..ad5f5dd47010 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 d91b60d9163c..cd71e32f012b 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 3eed9d7f6b5a..4251947d6df0 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 143fa9e1231b..989a0592f3af 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 556d1cc934d6..fe6238a2c16f 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 8e0d85af3457..e0259a9e091c 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 8ebc1bb38606..2e832ca3fdfc 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 d2666e83461a..e1db626057cf 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 4be653db4697..efae1be355b1 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 c13d3174f681..1578586a8b76 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 3df66a84abaa..5faad2fbe87f 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 22e001579f35..1b54ed19a30d 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 f28be11dbfaa..0a5968ae14f9 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 4acce8147d68..e725f437d3cd 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 a837ecbd2e17..c17d839f4750 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 288b28641de5..506098ab0489 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 fc80f7ef829b..1ea257d7f623 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 d2e4e86e4cab..e5d87ebb27ea 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 1c72cc7a92d6..f45dacecccaf 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 2098efbe6f9d..fa844d69a607 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 f42d5508e025..b6205a1eba56 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 b9dbed0896dd..f17b1c75f540 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 a308aa45ae59..cac439d0fa4f 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 a32583bcb99a..1c71a728132c 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 710cc7b8fea6..f0e825736a92 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 1f7cfd0e6b49..865089e8643d 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 7c904182d792..a13f17244023 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 bbfa894e8e38..1574a2c8c897 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 67c3adc6f2d5..2462a36868be 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 3a6d030d67e3..cc63dda00a1c 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 98edca9e3f68..0db2ae950c45 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 c45ff011c931..405e5a168a39 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 2a41173387e7..c99d23dc61cb 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 2ad89a0d713a..d30713912685 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 4656d73d061b..8fb325a3910a 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 0f00ad53315d..ed0ee6fdc7da 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 d6ef6b1ede0b..41a37a2c4470 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 3304af97fb9f..e99d2e6e9b01 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 d33af8cd071d..a083681de624 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 c2b2c6f24dec..000034c36e46 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 537ff992bcf5..79b77f775dc2 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 c69a3d907da4..69bfa333939f 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 c1bffa2904a4..d8fc0e608a81 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 14bb3fc1deab..3e89ee2abded 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 5f187a24a082..192f08e5ef79 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 2fa120144a1f..71924158bca9 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 f3ab44863d16..455df25038ec 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 f07961d15603..e28263298a1c 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 ccd5967e7a13..447f66120304 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 e8aa93ba7700..0fef97b8833f 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 794818bcb312..5bb913c8c01c 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 c5072f02a3b3..068ebdd0ef85 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 44adbcca9086..f609a5884816 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 4a3cfc28b1b1..60428736d8ea 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 26272005a130..7443501c37dc 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 6939255fb818..0370229d8839 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 d866db5383a4..27612af8416a 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 b2e5eebf8807..7a96d5f4fa8b 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 c17b129621e4..155d863607db 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 334abf39f0ce..908840b093bb 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 c8f3fd248326..aeba324a3eb1 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 dbf2e1f3d299..51a4793a0e67 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 3af14d5bcad5..2ee497272e53 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 2b5bff8d7901..9ce018d8917c 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 4fce9472f5d5..7d44ad12d17f 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 422f0a194bfa..216e14e73455 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 7a5a1b3a86e2..c50bec4770c9 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 11b9713b9414..2c0975bbf218 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 417eef24d2c2..70d7ec60268f 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 15780906aa52..729d66b67b87 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 2392a5e00496..960d3432ea2c 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 acd2653378ee..58776ca90f12 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 81fe8efe3f4a..319bef9fb8d2 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 3c853ea4d731..8cd4eb3e02f2 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 d1e63b78d6f7..2cfc3a730f27 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 e2af857073dc..a791b4de4775 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 cb7268f0d015..d77bd3e80436 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 aab394b51dd5..6ca5a9403af6 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 cdcd35f14345..9a51f9d5c7e1 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 2ed4db495d29..37dc5b7c300c 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 fff3e6c471d3..78ff83e371cc 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 4abb0eb871d9..8d296da80ce2 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 f7f67db83ed0..efcc42b0c21c 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 6ec4c08da48b..41541d9b447d 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 c65bc9ccec2b..3dd1809a47d6 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 e268ef681929..12076328f5cc 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 8fd4c11ad6fa..347cf9dd218b 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 dcca26d595fa..c1d8c62613c3 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 db4bd184df66..0c55acd66c21 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 a2d880348170..96b604ae01ea 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 dd1294c2b212..71aef1e050d2 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 37162cd32823..ad074e871e71 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 4a91f73a91f2..bbbcf349591d 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 b5dac4059988..9ce837d4de06 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 8c9f5b53d51b..930ea320468e 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 30ca06b7590d..840499822125 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 52180a78e313..c657b59c5f9c 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 76b984ccfd0c..5c203504f546 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 71b01b0d3bc8..209ad58122ff 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 64fc610bac41..ee0fa06d29c1 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 44da01b35dd2..6542d7ac59a6 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 95a07cbcf39f..03d7f82d8c74 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 7ea92f6c8834..bed067791041 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 c92aa85957c3..56622d8452db 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 4704bef9eae6..cc1cd3a9f57a 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 833a0f214400..e66d3978f51c 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 1b7def318fb4..92f4e34ae7e7 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 b3f4984c6e0f..c280c4a40908 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 cb07cde065d4..fcc18106c05f 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 7c1ccbf91484..ee44b1198a40 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 6e9755358764..1b9d165c62a4 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 15457c642b9b..310b6c1580e6 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 b9a0e71b543f..e9eeb2f2b42a 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 c400c94e1a3b..df3c55773b4e 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 4f774ff5409d..c8cce9f1f350 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 644a87e8b8e9..f2b7924b2a22 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 8c5ef972266f..54d93f494d1b 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 7e98f2e7601e..424b7f629fcc 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 a12980d227be..891a375fdf1d 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 16dcd350eca7..179c84561796 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 a4dbc353e5eb..607fc6805bc8 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 9cc9a69797ff..1f4bfb38ceb3 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 0448a38d5ede..691502aa4d2f 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 572b090103b0..54b7befa1f23 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 1c7d66f7b345..4e7f53574c05 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 c01c0928e822..d75e96498a6b 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 49ccaa5cd8a8..75c10927c4de 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 5c27e56851d9..f46836d5ac62 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 6dc2292ffebc..a2d7d5b2a490 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 025f9ba64de8..b1ed22f8f19d 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 b46de6fcbbaa..b6573ee8bb4c 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 fcad7140e94c..9c5db60a6525 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 ab4a239f0f64..2862df61bc2a 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 ce448dac4b82..2be56101de92 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 928d1be0671f..571f544ce78f 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 632cfb128371..e57a36c53bf2 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 8161e34b49cc..6dd3b1bae506 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 25e5b349c283..92ce8e79a6f6 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 ac898082f639..2cf649c89f83 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 1030604d3a9b..3a70acbdee2c 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 f032b631b2a3..59a1cfcac506 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 68f4024efe43..39a2ee99337d 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 74385bcd70e9..4a799d0cb37c 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 35ed3f41882a..f183ba891873 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 301981e43ca9..174534ab400b 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 b5adf5052275..171482885c17 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 8662992441cf..4f7e865c849f 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 aa4dc4359f24..3927fa3c70e6 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 325d063de02b..92eec72ff44e 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 912b4f734e84..5b0c0d5121c9 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 9a90804fac59..64bdc3fa8eeb 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 8df3b54a2f96..7d4a5d8ea361 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 d31e61efacd2..47f41106035a 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 f085e291b9e5..bd8f5690f8f8 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 84f43fa211a7..2a1820873a54 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 43d6fdb2f407..027163e22956 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 92ab0566fc33..f00911fd91ee 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 1d0742f2e2d8..b200718fc0ec 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 9b4ef4fd2ffd..31b8f21f4f67 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 64cdf8ef16b3..b41adf76740f 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 0f9b2d45fe33..40934bdac7e8 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 9ab6d42ae1ee..6dd31156f5be 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 efb40e116faa..962682585d88 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 1a427d67947c..8ab89a482984 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 d8c26f037b78..7784c39341ec 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 f5ad0d179ec8..c06f387f56c9 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 07b3fd02c196..f048a64d0f3e 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 e4b5d71b3b08..bc3bc1ccdbf8 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 6c3044912c78..df37f7306b22 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 2ead429e4f98..19887cfa8fd4 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 13ee1a9311a5..92a16eb9f383 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 92130a7052b4..203a75eeddac 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 f27a3279dd6a..49ff1207000d 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 ddf9e93cd934..a8f8fdf7c473 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 b04e4a0dadcd..b3232ffc0219 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 e74b33460fb9..c805f3d309ff 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 3d80c55b7b72..e0400f7130f8 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 e9e3bc30af32..43f6e3ff5670 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 b57ab4ac5b67..4a5e142794dc 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 e96764331d04..c6c87b341d0d 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 2262a6bbedab..4563e98fb3a2 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 eae90cfc73ae..e03efac1613f 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 5c5b002b8e76..c1a0d087f36b 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 3a835d507b51..0aa4be0f53e3 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 943d82356bbc..a9b4b94c3eac 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 a179706b71f7..c3d3187aedbe 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 ab26cc9f3ba0..a78b261d6efd 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 57ea87e36c61..e974717be735 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 9d430a63df04..c7aabc325161 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 757709137522..5d0be004531c 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 5f7fc1f3c63f..c343912105bd 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 5384e35e4998..e3f3a2853a5a 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 045d79e32e68..748e610789a8 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 94b34d405d89..8b74f5a8f959 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 4cf32913c241..ff7e92439655 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 420924bc3e78..36daeb769fae 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 eba7020f36aa..82f950c22b85 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 ac6686f0d97d..068651b0055e 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 937469f99402..b4eec764e5c3 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 09b43453a76a..640ee07477bb 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 f8fdc832a624..8161a835b1ab 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 3ee128baaa7e..8ac5918bc5d9 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 acdf6611b343..f7dc8674fdcf 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 a18eeb711fe2..3f7e246707c4 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 5fad4780540a..3c99c1227971 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 392b9c913b48..6b3a5c1ad475 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 dc53d233a2ac..0295dbeb264a 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 3ba45b4c52d0..f89cdb390284 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 ff6d358a9dcd..d94a78bb014c 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 fb9b3b0b9174..ee0b06101e2f 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 11b3430e14d4..deac206afdcf 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 972be9aa6fa9..cacc490b0d80 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 5d0221b4b8b3..11605a125968 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 25c677c1bdbe..a2fac86aa01f 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 5da6c364ba70..75f01e85cbef 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 53eab1c82927..1dc56d8a45a3 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 1a278c5c8441..6a67cb0172ce 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 abe1cc5ff412..b499b5f2186d 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 3531579a95af..342014491a46 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 48f066ae6610..47e4dcee48bc 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 0c019d69e3e4..b6b50fe2db38 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 e4c2b0ee776b..94d45ac94c08 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 3cbe29d561b4..ae3ba1d12738 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 e31c696f4ab4..48b2be611cb5 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 c899dda60b1b..381ed4fce591 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 9d851479581f..c6c1d7b78d41 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 a618e2851a2a..a66d12688f57 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 d7e80c00fb91..ad86ded5e6a2 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 90addee144a4..a6b89692244e 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 1e0985e891f0..5ebd44892208 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 d0f0dd4e1af2..6e4d3dc19d67 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 b7f2c9b3306d..98fb3cef1832 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 c629cd78bcf9..5a528698c689 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 886f7ba38c8e..2981fa9dc4ce 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 b0a78f0833fb..dffababb2353 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 0a242172d0c5..d47a4ee30f81 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 cba1c4e9e83d..0e0c4007e940 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 1409e407bbe5..f0e58fb06746 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 74248fa83982..11a970455a61 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 eb300523734a..e5f51a20d57a 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 2f3c931aaf19..67156a246662 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 1d6465f5b0b7..0a00b7a78d53 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 12953e6fe889..5e6b33e44e93 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 6ad49ee43153..b8ef8361113b 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 9800e8606ca0..aa87c8c232ff 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 4857bb34f5d7..ed0bc27f58f1 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 ac93d65bff08..fbd78835fb5f 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 35f3a470c50f..34dc1b5af764 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 3ced4fc894d1..66fb36337ea1 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 e4a39b5d73d5..9b16dbf44994 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 44eca8899514..d182ff93882c 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 c0a1acd71a47..a3b4ac2c31a7 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 07369badbc60..b7f6b4fe627c 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 0404a46d1b1c..29c4ce91db52 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 95fa3ec5c3b2..8643a8f86017 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 0be04a141b3d..47b90069d1fa 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 c7808242abe9..be4e9e42e3b1 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 c0d71060dd02..64e831fcd188 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 425a898f1809..9dfd8e3d75c3 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 59f9e49a8c39..1af9d5ab3890 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 fbd1c9e1ca23..f4c2a7d1e7b0 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 59bd1b096851..5eba6036c3c7 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 a63fab0c0080..ff2c9b5bfd7c 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 20d0e2be4fa4..70bda1b55b2c 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 9c9cb1c02ed8..694a8bafcd48 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 15c945dd5e5b..c03a927204f7 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 a26fe0869a93..991b59a8219b 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 c8cbe5200bf5..068c5e15a3c7 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 7ea5971315b6..678697941944 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 0501da901eef..6af7b95045e7 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 49d795fe0b85..faf26cba98a4 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 fd119e36a2c5..1f24f6e3d53e 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 0636867ec110..da492c736b7c 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 ea39c74174f3..70514ab8c11f 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 {
 
-- 
GitLab