From 34659475784c5baf0bcb32926bfc81bd09ceebc6 Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Thu, 19 Dec 2013 10:28:42 -0800
Subject: [PATCH] Issue #2146517 by TR: Remove annotation 'use' statements from
all core classes.
---
core/lib/Drupal/Core/Annotation/Translation.php | 5 -----
core/lib/Drupal/Core/Entity/Plugin/DataType/Entity.php | 3 ---
.../Drupal/Core/Entity/Plugin/DataType/EntityReference.php | 2 --
.../Entity/Plugin/Validation/Constraint/BundleConstraint.php | 2 --
.../Plugin/Validation/Constraint/EntityChangedConstraint.php | 2 --
.../Plugin/Validation/Constraint/EntityTypeConstraint.php | 2 --
.../Validation/Constraint/ValidReferenceConstraint.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php | 2 --
.../Core/TypedData/Plugin/DataType/DateTimeIso8601.php | 2 --
.../Core/TypedData/Plugin/DataType/DurationIso8601.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Email.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php | 2 --
core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php | 2 --
.../Plugin/Validation/Constraint/AllowedValuesConstraint.php | 2 --
.../Plugin/Validation/Constraint/ComplexDataConstraint.php | 2 --
.../Plugin/Validation/Constraint/CountConstraint.php | 2 --
.../Plugin/Validation/Constraint/LengthConstraint.php | 2 --
.../Plugin/Validation/Constraint/PrimitiveTypeConstraint.php | 2 --
.../Plugin/Validation/Constraint/RangeConstraint.php | 2 --
.../action/lib/Drupal/action/Plugin/Action/EmailAction.php | 2 --
.../action/lib/Drupal/action/Plugin/Action/GotoAction.php | 2 --
.../action/lib/Drupal/action/Plugin/Action/MessageAction.php | 2 --
.../modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php | 2 --
.../modules/aggregator/lib/Drupal/aggregator/Entity/Item.php | 2 --
.../Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php | 2 --
.../aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php | 2 --
.../aggregator/Plugin/aggregator/parser/DefaultParser.php | 2 --
.../Plugin/aggregator/processor/DefaultProcessor.php | 2 --
.../lib/Drupal/aggregator/Plugin/views/argument/Fid.php | 1 -
.../lib/Drupal/aggregator/Plugin/views/argument/Iid.php | 1 -
.../lib/Drupal/aggregator/Plugin/views/field/TitleLink.php | 1 -
.../lib/Drupal/aggregator/Plugin/views/field/Xss.php | 1 -
.../lib/Drupal/aggregator/Plugin/views/row/Rss.php | 2 --
.../Plugin/aggregator/fetcher/TestFetcher.php | 2 --
.../aggregator_test/Plugin/aggregator/parser/TestParser.php | 2 --
.../Plugin/aggregator/processor/TestProcessor.php | 2 --
.../lib/Drupal/custom_block/Entity/CustomBlock.php | 2 --
.../lib/Drupal/custom_block/Entity/CustomBlockType.php | 2 --
.../Drupal/custom_block/Plugin/Block/CustomBlockBlock.php | 2 --
core/modules/block/lib/Drupal/block/Entity/Block.php | 2 --
.../block/lib/Drupal/block/Plugin/views/display/Block.php | 2 --
.../block_test/Plugin/Block/TestBlockInstantiation.php | 2 --
.../lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php | 2 --
.../lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php | 3 ---
.../lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php | 2 --
.../lib/Drupal/book/Plugin/Block/BookNavigationBlock.php | 2 --
.../breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php | 2 --
.../lib/Drupal/breakpoint/Entity/BreakpointGroup.php | 2 --
.../Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php | 2 --
.../ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php | 2 --
.../lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php | 2 --
.../lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php | 2 --
.../Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php | 2 --
.../ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php | 2 --
.../lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php | 2 --
.../ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php | 2 --
.../ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php | 2 --
.../Plugin/CKEditorPlugin/LlamaContextualAndButton.php | 2 --
core/modules/comment/lib/Drupal/comment/Entity/Comment.php | 2 --
.../lib/Drupal/comment/Plugin/Action/PublishComment.php | 2 --
.../comment/lib/Drupal/comment/Plugin/Action/SaveComment.php | 2 --
.../comment/Plugin/Action/UnpublishByKeywordComment.php | 2 --
.../lib/Drupal/comment/Plugin/Action/UnpublishComment.php | 2 --
.../Plugin/entity_reference/selection/CommentSelection.php | 2 --
.../lib/Drupal/comment/Plugin/views/argument/UserUid.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/Comment.php | 1 -
.../comment/lib/Drupal/comment/Plugin/views/field/Depth.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/EntityLink.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/LastTimestamp.php | 1 -
.../comment/lib/Drupal/comment/Plugin/views/field/Link.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/LinkApprove.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/LinkDelete.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/LinkEdit.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/LinkReply.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/NodeComment.php | 1 -
.../Drupal/comment/Plugin/views/field/NodeNewComments.php | 1 -
.../comment/Plugin/views/field/StatisticsLastCommentName.php | 1 -
.../comment/Plugin/views/field/StatisticsLastUpdated.php | 1 -
.../lib/Drupal/comment/Plugin/views/field/Username.php | 1 -
.../lib/Drupal/comment/Plugin/views/filter/NodeComment.php | 1 -
.../comment/Plugin/views/filter/StatisticsLastUpdated.php | 1 -
.../lib/Drupal/comment/Plugin/views/filter/UserUid.php | 1 -
.../comment/lib/Drupal/comment/Plugin/views/row/Rss.php | 2 --
.../comment/Plugin/views/sort/StatisticsLastCommentName.php | 1 -
.../comment/Plugin/views/sort/StatisticsLastUpdated.php | 1 -
.../comment/lib/Drupal/comment/Plugin/views/sort/Thread.php | 1 -
.../lib/Drupal/comment/Plugin/views/wizard/Comment.php | 2 --
.../lib/Drupal/config_test/Entity/ConfigQueryTest.php | 3 ---
.../config_test/lib/Drupal/config_test/Entity/ConfigTest.php | 2 --
core/modules/contact/lib/Drupal/contact/Entity/Category.php | 2 --
.../Plugin/views/field/TranslationLink.php | 1 -
.../Drupal/contextual/Plugin/views/field/ContextualLinks.php | 1 -
.../lib/Drupal/dblog/Plugin/views/field/DblogMessage.php | 1 -
.../lib/Drupal/dblog/Plugin/views/field/DblogOperations.php | 1 -
.../dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php | 2 --
.../edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php | 1 -
.../lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php | 1 -
.../Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php | 1 -
core/modules/editor/lib/Drupal/editor/Entity/Editor.php | 2 --
.../editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php | 2 --
.../lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php | 2 --
.../entity/lib/Drupal/entity/Entity/EntityFormMode.php | 2 --
.../entity/lib/Drupal/entity/Entity/EntityViewMode.php | 2 --
.../Plugin/entity_reference/selection/SelectionBase.php | 2 --
.../Plugin/views/display/EntityReference.php | 2 --
.../entity_reference/Plugin/views/row/EntityReference.php | 2 --
.../entity_reference/Plugin/views/style/EntityReference.php | 2 --
.../lib/Drupal/field/Plugin/views/argument/FieldList.php | 1 -
.../lib/Drupal/field/Plugin/views/argument/ListString.php | 1 -
.../field/lib/Drupal/field/Plugin/views/filter/FieldList.php | 1 -
.../field_test/Plugin/Field/FieldType/HiddenTestItem.php | 2 --
.../Drupal/field_test/Plugin/Field/FieldType/TestItem.php | 2 --
.../Plugin/Validation/Constraint/TestFieldConstraint.php | 3 ---
.../lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php | 2 --
core/modules/file/lib/Drupal/file/Entity/File.php | 2 --
.../file/Plugin/entity_reference/selection/FileSelection.php | 2 --
.../file/lib/Drupal/file/Plugin/views/argument/Fid.php | 1 -
.../file/lib/Drupal/file/Plugin/views/field/Extension.php | 1 -
.../modules/file/lib/Drupal/file/Plugin/views/field/File.php | 1 -
.../file/lib/Drupal/file/Plugin/views/field/FileMime.php | 1 -
.../file/lib/Drupal/file/Plugin/views/field/Status.php | 1 -
core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php | 1 -
.../file/lib/Drupal/file/Plugin/views/filter/Status.php | 1 -
.../file/lib/Drupal/file/Plugin/views/wizard/File.php | 2 --
.../modules/filter/lib/Drupal/filter/Entity/FilterFormat.php | 2 --
.../lib/Drupal/filter/Plugin/DataType/FilterFormat.php | 2 --
.../filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php | 2 --
.../filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php | 2 --
.../filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php | 2 --
.../lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php | 2 --
.../lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php | 2 --
.../Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php | 2 --
.../filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php | 2 --
.../filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php | 2 --
.../Drupal/filter_test/Plugin/Filter/FilterTestReplace.php | 2 --
.../Plugin/Filter/FilterTestRestrictTagsAndAttributes.php | 2 --
.../filter_test/Plugin/Filter/FilterTestUncacheable.php | 2 --
.../lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php | 3 ---
.../forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php | 3 ---
.../history/Plugin/views/field/HistoryUserTimestamp.php | 1 -
.../history/Plugin/views/filter/HistoryUserTimestamp.php | 1 -
core/modules/image/lib/Drupal/image/Entity/ImageStyle.php | 2 --
.../lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php | 2 --
.../image/Plugin/ImageEffect/DesaturateImageEffect.php | 2 --
.../Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php | 2 --
.../Drupal/image/Plugin/ImageEffect/RotateImageEffect.php | 2 --
.../image/Plugin/ImageEffect/ScaleAndCropImageEffect.php | 2 --
.../lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php | 2 --
.../Plugin/ImageEffect/NullTestImageEffect.php | 2 --
.../modules/language/lib/Drupal/language/Entity/Language.php | 2 --
.../lib/Drupal/language/Plugin/Block/LanguageBlock.php | 2 --
.../lib/Drupal/language/Plugin/Condition/Language.php | 2 --
.../language/Plugin/views/argument/LanguageArgument.php | 1 -
.../lib/Drupal/language/Plugin/views/field/LanguageField.php | 1 -
.../Drupal/language/Plugin/views/filter/LanguageFilter.php | 1 -
core/modules/node/lib/Drupal/node/Entity/NodeType.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/DeleteNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/DemoteNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/PromoteNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/PublishNode.php | 2 --
core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/StickyNode.php | 2 --
.../lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/UnpublishNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Action/UnstickyNode.php | 2 --
.../node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php | 2 --
.../node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php | 2 --
.../node/lib/Drupal/node/Plugin/Condition/NodeType.php | 2 --
.../node/lib/Drupal/node/Plugin/Search/NodeSearch.php | 2 --
.../node/Plugin/entity_reference/selection/NodeSelection.php | 2 --
.../node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php | 1 -
.../node/lib/Drupal/node/Plugin/views/argument/Nid.php | 1 -
.../node/lib/Drupal/node/Plugin/views/argument/Type.php | 1 -
.../lib/Drupal/node/Plugin/views/argument/UidRevision.php | 1 -
.../node/lib/Drupal/node/Plugin/views/argument/Vid.php | 1 -
.../lib/Drupal/node/Plugin/views/argument_default/Node.php | 2 --
.../lib/Drupal/node/Plugin/views/argument_validator/Node.php | 2 --
.../node/lib/Drupal/node/Plugin/views/field/Language.php | 1 -
.../modules/node/lib/Drupal/node/Plugin/views/field/Link.php | 1 -
.../node/lib/Drupal/node/Plugin/views/field/LinkDelete.php | 1 -
.../node/lib/Drupal/node/Plugin/views/field/LinkEdit.php | 1 -
.../modules/node/lib/Drupal/node/Plugin/views/field/Node.php | 1 -
.../node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php | 1 -
.../modules/node/lib/Drupal/node/Plugin/views/field/Path.php | 1 -
.../node/lib/Drupal/node/Plugin/views/field/Revision.php | 1 -
.../node/lib/Drupal/node/Plugin/views/field/RevisionLink.php | 1 -
.../Drupal/node/Plugin/views/field/RevisionLinkDelete.php | 1 -
.../Drupal/node/Plugin/views/field/RevisionLinkRevert.php | 1 -
.../modules/node/lib/Drupal/node/Plugin/views/field/Type.php | 1 -
.../node/lib/Drupal/node/Plugin/views/filter/Access.php | 1 -
.../node/lib/Drupal/node/Plugin/views/filter/Status.php | 1 -
.../node/lib/Drupal/node/Plugin/views/filter/UidRevision.php | 1 -
core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php | 2 --
.../node/lib/Drupal/node/Plugin/views/wizard/Node.php | 2 --
.../lib/Drupal/node/Plugin/views/wizard/NodeRevision.php | 2 --
.../picture/lib/Drupal/picture/Entity/PictureMapping.php | 2 --
core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php | 2 --
.../lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php | 2 --
.../lib/Drupal/rest/Plugin/rest/resource/EntityResource.php | 2 --
.../rest/lib/Drupal/rest/Plugin/views/display/RestExport.php | 2 --
.../rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php | 2 --
.../rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php | 2 --
.../rest/lib/Drupal/rest/Plugin/views/style/Serializer.php | 2 --
.../lib/Drupal/search/Plugin/views/argument/Search.php | 1 -
.../search/lib/Drupal/search/Plugin/views/field/Score.php | 1 -
.../search/lib/Drupal/search/Plugin/views/filter/Search.php | 1 -
.../search/lib/Drupal/search/Plugin/views/row/SearchRow.php | 2 --
.../search/lib/Drupal/search/Plugin/views/sort/Score.php | 1 -
.../Plugin/Search/SearchExtraTypeSearch.php | 2 --
.../lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php | 2 --
.../statistics/Plugin/Block/StatisticsPopularBlock.php | 2 --
core/modules/system/lib/Drupal/system/Entity/Action.php | 2 --
core/modules/system/lib/Drupal/system/Entity/DateFormat.php | 2 --
core/modules/system/lib/Drupal/system/Entity/Menu.php | 2 --
.../modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php | 2 --
.../modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php | 2 --
.../lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php | 2 --
.../lib/Drupal/system/Plugin/Block/SystemHelpBlock.php | 2 --
.../lib/Drupal/system/Plugin/Block/SystemMainBlock.php | 2 --
.../lib/Drupal/system/Plugin/Block/SystemMenuBlock.php | 2 --
.../lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php | 2 --
.../lib/Drupal/action_test/Plugin/Action/NoType.php | 2 --
.../lib/Drupal/action_test/Plugin/Action/SaveEntity.php | 2 --
.../entity_cache_test_dependency/Entity/EntityCacheTest.php | 2 --
.../entity_test/lib/Drupal/entity_test/Entity/EntityTest.php | 2 --
.../lib/Drupal/entity_test/Entity/EntityTestCache.php | 2 --
.../Drupal/entity_test/Entity/EntityTestDefaultAccess.php | 3 ---
.../lib/Drupal/entity_test/Entity/EntityTestLabel.php | 3 ---
.../Drupal/entity_test/Entity/EntityTestLabelCallback.php | 3 ---
.../lib/Drupal/entity_test/Entity/EntityTestMul.php | 2 --
.../lib/Drupal/entity_test/Entity/EntityTestMulRev.php | 2 --
.../lib/Drupal/entity_test/Entity/EntityTestNoLabel.php | 3 ---
.../lib/Drupal/entity_test/Entity/EntityTestRev.php | 2 --
.../Plugin/Menu/LocalTask/TestTasksSettingsSub1.php | 2 --
.../lib/Drupal/plugin_test/CustomDirectoryExample1.php | 2 --
.../lib/Drupal/plugin_test/CustomDirectoryExample2.php | 2 --
.../Plugin/plugin_test/custom_annotation/Example1.php | 2 --
.../Plugin/plugin_test/custom_annotation/Example2.php | 2 --
.../Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php | 3 ---
.../Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php | 3 ---
.../Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php | 3 ---
.../Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php | 3 ---
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php | 2 --
.../taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php | 2 --
.../Plugin/entity_reference/selection/TermSelection.php | 2 --
.../lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php | 1 -
.../Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php | 1 -
.../taxonomy/Plugin/views/argument/IndexTidDepthModifier.php | 1 -
.../lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php | 1 -
.../Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php | 1 -
.../Drupal/taxonomy/Plugin/views/argument_default/Tid.php | 2 --
.../lib/Drupal/taxonomy/Plugin/views/field/Language.php | 1 -
.../lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php | 1 -
.../lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php | 1 -
.../Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php | 1 -
.../Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php | 1 -
.../taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php | 2 --
.../taxonomy/Plugin/views/relationship/NodeTermData.php | 1 -
.../lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php | 2 --
core/modules/tour/lib/Drupal/tour/Entity/Tour.php | 2 --
.../tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php | 2 --
.../lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php | 2 --
.../lib/Drupal/tracker/Plugin/views/argument/UserUid.php | 1 -
.../lib/Drupal/tracker/Plugin/views/filter/UserUid.php | 1 -
.../user/lib/Drupal/user/Plugin/Action/AddRoleUser.php | 2 --
.../modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php | 2 --
.../user/lib/Drupal/user/Plugin/Action/CancelUser.php | 2 --
.../user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php | 2 --
.../user/lib/Drupal/user/Plugin/Action/UnblockUser.php | 2 --
.../user/lib/Drupal/user/Plugin/Block/UserNewBlock.php | 2 --
.../user/lib/Drupal/user/Plugin/Search/UserSearch.php | 2 --
.../user/Plugin/Validation/Constraint/UserMailUnique.php | 3 ---
.../user/Plugin/Validation/Constraint/UserNameConstraint.php | 3 ---
.../user/Plugin/Validation/Constraint/UserNameUnique.php | 3 ---
.../user/Plugin/entity_reference/selection/UserSelection.php | 2 --
.../user/lib/Drupal/user/Plugin/views/access/Permission.php | 3 ---
.../user/lib/Drupal/user/Plugin/views/access/Role.php | 2 --
.../user/lib/Drupal/user/Plugin/views/argument/RolesRid.php | 1 -
.../user/Plugin/views/argument_default/CurrentUser.php | 2 --
.../lib/Drupal/user/Plugin/views/argument_validator/User.php | 2 --
.../user/lib/Drupal/user/Plugin/views/field/Language.php | 1 -
.../modules/user/lib/Drupal/user/Plugin/views/field/Link.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/LinkCancel.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/LinkEdit.php | 1 -
.../modules/user/lib/Drupal/user/Plugin/views/field/Mail.php | 1 -
.../modules/user/lib/Drupal/user/Plugin/views/field/Name.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/Permissions.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/Roles.php | 1 -
.../modules/user/lib/Drupal/user/Plugin/views/field/User.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php | 1 -
.../user/lib/Drupal/user/Plugin/views/field/UserData.php | 1 -
.../user/lib/Drupal/user/Plugin/views/filter/Current.php | 1 -
.../user/lib/Drupal/user/Plugin/views/filter/Name.php | 1 -
.../user/lib/Drupal/user/Plugin/views/filter/Permissions.php | 1 -
.../user/lib/Drupal/user/Plugin/views/filter/Roles.php | 1 -
.../user/lib/Drupal/user/Plugin/views/wizard/Users.php | 2 --
.../views/lib/Drupal/views/Plugin/Block/ViewsBlock.php | 2 --
.../Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php | 3 ---
.../Plugin/entity_reference/selection/ViewsSelection.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/Broken.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/Date.php | 1 -
.../views/lib/Drupal/views/Plugin/views/argument/DayDate.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/Formula.php | 1 -
.../lib/Drupal/views/Plugin/views/argument/FullDate.php | 2 --
.../Drupal/views/Plugin/views/argument/GroupByNumeric.php | 2 --
.../lib/Drupal/views/Plugin/views/argument/ManyToOne.php | 1 -
.../lib/Drupal/views/Plugin/views/argument/MonthDate.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/Null.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/Numeric.php | 2 --
.../lib/Drupal/views/Plugin/views/argument/Standard.php | 2 --
.../views/lib/Drupal/views/Plugin/views/argument/String.php | 1 -
.../lib/Drupal/views/Plugin/views/argument/WeekDate.php | 2 --
.../lib/Drupal/views/Plugin/views/argument/YearDate.php | 2 --
.../lib/Drupal/views/Plugin/views/argument/YearMonthDate.php | 2 --
.../lib/Drupal/views/Plugin/views/argument_default/Fixed.php | 3 ---
.../lib/Drupal/views/Plugin/views/argument_default/Raw.php | 2 --
.../Drupal/views/Plugin/views/argument_validator/None.php | 3 ---
.../Drupal/views/Plugin/views/argument_validator/Numeric.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/cache/None.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/cache/Time.php | 2 --
.../lib/Drupal/views/Plugin/views/display/Attachment.php | 2 --
.../lib/Drupal/views/Plugin/views/display/DefaultDisplay.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/display/Embed.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/display/Feed.php | 2 --
.../views/lib/Drupal/views/Plugin/views/display/Page.php | 2 --
.../Plugin/views/display_extender/DefaultDisplayExtender.php | 3 ---
.../views/display_extender/DisplayExtenderPluginBase.php | 1 -
.../lib/Drupal/views/Plugin/views/exposed_form/Basic.php | 3 ---
.../Drupal/views/Plugin/views/exposed_form/InputRequired.php | 2 --
.../lib/Drupal/views/Plugin/views/field/ActionBulkForm.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Boolean.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Broken.php | 2 --
.../views/lib/Drupal/views/Plugin/views/field/Counter.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Custom.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Date.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Dropbutton.php | 1 -
.../lib/Drupal/views/Plugin/views/field/EntityLabel.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/FileSize.php | 1 -
.../lib/Drupal/views/Plugin/views/field/MachineName.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Markup.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Numeric.php | 1 -
.../lib/Drupal/views/Plugin/views/field/PrerenderList.php | 2 --
.../views/lib/Drupal/views/Plugin/views/field/Serialized.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Standard.php | 2 --
.../lib/Drupal/views/Plugin/views/field/TimeInterval.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Url.php | 1 -
.../views/lib/Drupal/views/Plugin/views/field/Xss.php | 1 -
.../lib/Drupal/views/Plugin/views/filter/BooleanOperator.php | 1 -
.../views/Plugin/views/filter/BooleanOperatorString.php | 2 --
.../views/lib/Drupal/views/Plugin/views/filter/Broken.php | 1 -
.../views/lib/Drupal/views/Plugin/views/filter/Bundle.php | 1 -
.../views/lib/Drupal/views/Plugin/views/filter/Combine.php | 2 --
.../views/lib/Drupal/views/Plugin/views/filter/Date.php | 2 --
.../views/lib/Drupal/views/Plugin/views/filter/Equality.php | 2 --
.../Drupal/views/Plugin/views/filter/FilterPluginBase.php | 1 -
.../lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php | 2 --
.../lib/Drupal/views/Plugin/views/filter/InOperator.php | 1 -
.../views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php | 1 -
.../views/lib/Drupal/views/Plugin/views/filter/Numeric.php | 1 -
.../views/lib/Drupal/views/Plugin/views/filter/Standard.php | 2 --
.../views/lib/Drupal/views/Plugin/views/filter/String.php | 1 -
.../views/lib/Drupal/views/Plugin/views/pager/Full.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/pager/Mini.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/pager/None.php | 2 --
.../views/lib/Drupal/views/Plugin/views/pager/Some.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/query/Sql.php | 2 --
.../views/lib/Drupal/views/Plugin/views/row/Fields.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/row/RssFields.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/sort/Broken.php | 2 --
.../views/lib/Drupal/views/Plugin/views/sort/Date.php | 2 --
.../lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php | 1 -
.../lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php | 2 --
.../views/lib/Drupal/views/Plugin/views/sort/Random.php | 2 --
.../lib/Drupal/views/Plugin/views/sort/SortPluginBase.php | 1 -
.../views/lib/Drupal/views/Plugin/views/sort/Standard.php | 2 --
.../lib/Drupal/views/Plugin/views/style/DefaultSummary.php | 2 --
.../views/lib/Drupal/views/Plugin/views/style/Grid.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/style/HtmlList.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/style/Rss.php | 3 ---
.../lib/Drupal/views/Plugin/views/style/StylePluginBase.php | 2 --
.../views/lib/Drupal/views/Plugin/views/style/Table.php | 2 --
.../Drupal/views/Plugin/views/style/UnformattedSummary.php | 3 ---
.../views/lib/Drupal/views/Plugin/views/wizard/Standard.php | 3 ---
.../views_test_data/Plugin/views/access/StaticTest.php | 2 --
.../Drupal/views_test_data/Plugin/views/area/TestExample.php | 1 -
.../Plugin/views/argument_default/ArgumentDefaultTest.php | 2 --
.../Plugin/views/display/DisplayNoAreaTest.php | 3 ---
.../views_test_data/Plugin/views/display/DisplayTest.php | 2 --
.../Plugin/views/display_extender/DisplayExtenderTest.php | 3 ---
.../Plugin/views/display_extender/DisplayExtenderTest2.php | 3 ---
.../Drupal/views_test_data/Plugin/views/field/FieldTest.php | 1 -
.../views_test_data/Plugin/views/filter/FilterTest.php | 1 -
.../Drupal/views_test_data/Plugin/views/join/JoinTest.php | 2 --
.../Drupal/views_test_data/Plugin/views/query/QueryTest.php | 2 --
.../lib/Drupal/views_test_data/Plugin/views/row/RowTest.php | 2 --
.../views_test_data/Plugin/views/style/MappingTest.php | 2 --
.../views_test_data/Plugin/views/style/StyleTemplateTest.php | 2 --
.../Drupal/views_test_data/Plugin/views/style/StyleTest.php | 2 --
407 files changed, 724 deletions(-)
diff --git a/core/lib/Drupal/Core/Annotation/Translation.php b/core/lib/Drupal/Core/Annotation/Translation.php
index 9d7f4cdb79c3..96ffa9c5a71e 100644
--- a/core/lib/Drupal/Core/Annotation/Translation.php
+++ b/core/lib/Drupal/Core/Annotation/Translation.php
@@ -24,11 +24,6 @@
* Remove spaces after @ in your actual plugin - these are put into this sample
* code so that it is not recognized as annotation.
*
- * You will also need to make sure that your class file includes the line:
- * @code
- * use Drupal\Core\Annotation\Translation;
- * @endcode
- *
* It is also possible to provide a context with the text, similar to t():
* @code
* title = @ Translation("Bundle", context = "Validation"),
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/Entity.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/Entity.php
index 99762322aa35..1d9a00f43414 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/Entity.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/Entity.php
@@ -7,9 +7,6 @@
namespace Drupal\Core\Entity\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Defines the base plugin for deriving data types for entity types.
*
diff --git a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php
index 74f25b4612ad..69aef4a41b48 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/DataType/EntityReference.php
@@ -8,8 +8,6 @@
namespace Drupal\Core\Entity\Plugin\DataType;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\DataReferenceBase;
/**
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
index 2383b3104dca..3bee33089865 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraint.php
@@ -8,8 +8,6 @@
namespace Drupal\Core\Entity\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
/**
* Checks if a value is a valid entity type.
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php
index 5cd34a629b67..8a5f319d76d8 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityChangedConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Entity\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraint;
/**
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
index 2571bb930ee3..df25b6c17afe 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraint.php
@@ -8,8 +8,6 @@
namespace Drupal\Core\Entity\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
/**
* Checks if a value is a valid entity type.
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ValidReferenceConstraint.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ValidReferenceConstraint.php
index f85da8d3ace9..2a7d6a9b92db 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ValidReferenceConstraint.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/ValidReferenceConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Entity\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraint;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php
index 9236b22b4b9b..e53b3aeb18d8 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Any.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\TypedData;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
index 16ac5d67dc43..3fc1440512d7 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
@@ -9,8 +9,6 @@
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\BinaryInterface;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\TypedData;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
index 5c87f6aa451b..7acb3dd343e0 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\BooleanInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
index 629d675a951a..8c354572b492 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\TypedData\Type\DateTimeInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
index 9e67026ced74..eeedad459380 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\Type\DurationInterface;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Email.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Email.php
index 4602f69490fd..f68ffc25691b 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Email.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Email.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\Type\StringInterface;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
index 463e8f0c6ccd..d1ff6a892f95 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\FloatInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
index 33625ad64622..4d89e2fa48eb 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\IntegerInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
index 0b5a791df1dd..510a8693c66d 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Language\Language as LanguageObject;
use Drupal\Core\TypedData\TypedData;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
index f3acbd38a69e..100f4243ff02 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Map.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\Core\TypedData\TypedData;
use Drupal\Core\TypedData\ComplexDataInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
index 3c060b7ec1d4..36696c5023f3 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\StringInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
index c91fcd2e7a9f..94362dd7ee69 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\Type\DurationInterface;
/**
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
index c817e251c8c4..800344b454ba 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\TypedData\Type\DateTimeInterface;
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
index d41fa3c7eaf3..24fd9b64eb03 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\TypedData\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\PrimitiveBase;
use Drupal\Core\TypedData\Type\UriInterface;
use Drupal\Core\TypedData\TypedData;
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php
index 08f9279d2f86..34b652db900b 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraint.php
@@ -8,8 +8,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraints\Choice;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
/**
* Checks for the value being allowed.
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
index 5eb7f3583c98..c9638ae6fe5a 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/ComplexDataConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraint;
/**
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php
index d44ff6bb92d1..77836a70a46e 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/CountConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Count;
/**
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php
index f9bbfa90622b..f8b34b41fc14 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/LengthConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Length;
/**
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php
index 41c7feeeb3cc..1d9ca3c80614 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraint;
/**
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php
index debdc390a936..c35b64fd678a 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraint.php
@@ -7,8 +7,6 @@
namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Validator\Constraints\Range;
/**
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
index fef70fdde361..a92486181029 100644
--- a/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
+++ b/core/modules/action/lib/Drupal/action/Plugin/Action/EmailAction.php
@@ -7,8 +7,6 @@
namespace Drupal\action\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php b/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php
index d68f06e67188..e596f2453666 100644
--- a/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php
+++ b/core/modules/action/lib/Drupal/action/Plugin/Action/GotoAction.php
@@ -7,8 +7,6 @@
namespace Drupal\action\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\UrlGeneratorInterface;
diff --git a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php b/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php
index 9896b4b8f45c..c2591b9712f5 100644
--- a/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php
+++ b/core/modules/action/lib/Drupal/action/Plugin/Action/MessageAction.php
@@ -8,8 +8,6 @@
namespace Drupal\action\Plugin\Action;
use Drupal\Component\Utility\Xss;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Utility\Token;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
index 01d6d7d7869b..98d08bac7d82 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
@@ -11,8 +11,6 @@
use Drupal\Core\Field\FieldDefinition;
use Symfony\Component\DependencyInjection\Container;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\aggregator\FeedInterface;
/**
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
index 12829368f7db..f1b2a09cd50b 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
@@ -9,8 +9,6 @@
use Drupal\Core\Entity\ContentEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\aggregator\ItemInterface;
use Drupal\Core\Field\FieldDefinition;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
index 341e92d3f67a..767639e22932 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\aggregator\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
index 38306d7876f8..ef253577da5a 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -7,10 +7,8 @@
namespace Drupal\aggregator\Plugin\aggregator\fetcher;
-use Drupal\aggregator\Annotation\AggregatorFetcher;
use Drupal\aggregator\Plugin\FetcherInterface;
use Drupal\aggregator\Entity\Feed;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Guzzle\Http\ClientInterface;
use Guzzle\Http\Exception\BadResponseException;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
index 9b2bcb0c46f4..5c92487c3842 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/parser/DefaultParser.php
@@ -9,8 +9,6 @@
use Drupal\aggregator\Plugin\ParserInterface;
use Drupal\aggregator\Entity\Feed;
-use Drupal\aggregator\Annotation\AggregatorParser;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Cache\Cache;
use Zend\Feed\Reader\Reader;
use Zend\Feed\Reader\Exception\ExceptionInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
index 85b7217abadc..94a3da5c6359 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/processor/DefaultProcessor.php
@@ -7,11 +7,9 @@
namespace Drupal\aggregator\Plugin\aggregator\processor;
-use Drupal\aggregator\Annotation\AggregatorProcessor;
use Drupal\aggregator\Plugin\AggregatorPluginSettingsBase;
use Drupal\aggregator\Plugin\ProcessorInterface;
use Drupal\aggregator\Entity\Feed;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Database;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
index 9773ebaf9382..b6601c25642c 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Fid.php
@@ -9,7 +9,6 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Component\Utility\String;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
index 59c135b799cb..2fef3bea4bc4 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/Iid.php
@@ -9,7 +9,6 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Component\Utility\String;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
index 27b5aa0e667a..1b461540f83f 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/TitleLink.php
@@ -11,7 +11,6 @@
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Defines a field handler that turns an item's title into a clickable link to
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
index 5b755ffec94b..33803a3777c3 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Xss.php
@@ -8,7 +8,6 @@
namespace Drupal\aggregator\Plugin\views\field;
use Drupal\views\Plugin\views\field\Xss as XssBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Filters htmls tags from item.
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php
index 6aaee3ff0cc2..b0a6ac8bb727 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/row/Rss.php
@@ -8,8 +8,6 @@
namespace Drupal\aggregator\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a row plugin which loads an aggregator item and renders as RSS.
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
index 42c62bd1654a..de80cd58d7ef 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/fetcher/TestFetcher.php
@@ -10,8 +10,6 @@
use Drupal\aggregator\Plugin\FetcherInterface;
use Drupal\aggregator\Plugin\aggregator\fetcher\DefaultFetcher;
use Drupal\aggregator\Entity\Feed;
-use Drupal\aggregator\Annotation\AggregatorFetcher;
-use Drupal\Core\Annotation\Translation;
use Guzzle\Http\Exception\BadResponseException;
/**
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
index e12d0984eca5..3d5e6588fec8 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/parser/TestParser.php
@@ -10,8 +10,6 @@
use Drupal\aggregator\Plugin\ParserInterface;
use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Plugin\aggregator\parser\DefaultParser;
-use Drupal\aggregator\Annotation\AggregatorParser;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a Test parser implementation.
diff --git a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
index 04a5c5ada711..bbfe0d0efcfa 100644
--- a/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
+++ b/core/modules/aggregator/tests/modules/aggregator_test/lib/Drupal/aggregator_test/Plugin/aggregator/processor/TestProcessor.php
@@ -10,8 +10,6 @@
use Drupal\aggregator\Plugin\AggregatorPluginSettingsBase;
use Drupal\aggregator\Plugin\ProcessorInterface;
use Drupal\aggregator\Entity\Feed;
-use Drupal\aggregator\Annotation\AggregatorProcessor;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
index 08624bfd6c4c..4c900daaa6ea 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
@@ -9,8 +9,6 @@
use Drupal\Core\Entity\ContentEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Field\FieldDefinition;
use Drupal\custom_block\CustomBlockInterface;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
index c6340c641778..f61fa7b9b767 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
@@ -8,8 +8,6 @@
namespace Drupal\custom_block\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\custom_block\CustomBlockTypeInterface;
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
index eebc221c8a4c..fe7f461b625e 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Block/CustomBlockBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\custom_block\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/lib/Drupal/block/Entity/Block.php
index 02b1d766c355..89dde8d7166a 100644
--- a/core/modules/block/lib/Drupal/block/Entity/Block.php
+++ b/core/modules/block/lib/Drupal/block/Entity/Block.php
@@ -8,8 +8,6 @@
namespace Drupal\block\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\block\BlockPluginBag;
use Drupal\block\BlockInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 2f2eaac37db4..657b63536524 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -9,8 +9,6 @@
namespace Drupal\block\Plugin\views\display;
use Drupal\Component\Utility\String;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\Block\ViewsBlock;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Views;
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
index e12b07d1d3f4..85856a36c2ab 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestBlockInstantiation.php
@@ -8,8 +8,6 @@
namespace Drupal\block_test\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
index c26780a4040d..2fa61221bb38 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestCacheBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\block_test\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a block to test caching.
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
index eeeacb0efa2b..5d3437aec06c 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestHtmlIdBlock.php
@@ -7,9 +7,6 @@
namespace Drupal\block_test\Plugin\Block;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
-
/**
* Provides a block to test HTML IDs.
*
diff --git a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
index cca67946a2b3..156abf9c4c6d 100644
--- a/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
+++ b/core/modules/block/tests/modules/block_test/lib/Drupal/block_test/Plugin/Block/TestXSSTitleBlock.php
@@ -7,8 +7,6 @@
namespace Drupal\block_test\Plugin\Block;
-use Drupal\block\Annotation\Block;
-
/**
* Provides a block to test XSS in title.
*
diff --git a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
index 4e794f1e3b4e..3fd3f6457f79 100644
--- a/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
+++ b/core/modules/book/lib/Drupal/book/Plugin/Block/BookNavigationBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\book\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Book navigation' block.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
index 073613185da3..b23f6f613db7 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
@@ -14,8 +14,6 @@
use Drupal\breakpoint\InvalidBreakpointSourceException;
use Drupal\breakpoint\InvalidBreakpointSourceTypeException;
use Drupal\breakpoint\InvalidBreakpointMediaQueryException;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the Breakpoint entity.
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
index 61c1ea6881ea..f038cb13c052 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
@@ -11,8 +11,6 @@
use Drupal\breakpoint\BreakpointGroupInterface;
use Drupal\breakpoint\InvalidBreakpointSourceException;
use Drupal\breakpoint\InvalidBreakpointSourceTypeException;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the BreakpointGroup entity.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
index 7e95109f24b5..9fd6ec2e59ab 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImage.php
@@ -9,8 +9,6 @@
use Drupal\ckeditor\CKEditorPluginBase;
use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php
index 10174b857be2..bdbb7bb18ac4 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalImageCaption.php
@@ -9,10 +9,8 @@
use Drupal\Component\Plugin\PluginBase;
use Drupal\editor\Entity\Editor;
-use Drupal\Core\Annotation\Translation;
use Drupal\ckeditor\CKEditorPluginInterface;
use Drupal\ckeditor\CKEditorPluginContextualInterface;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
/**
* Defines the "drupalimagecaption" plugin.
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
index e9e193b9c9bf..2e764c1dadf7 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/DrupalLink.php
@@ -8,8 +8,6 @@
namespace Drupal\ckeditor\Plugin\CKEditorPlugin;
use Drupal\ckeditor\CKEditorPluginBase;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
index 3f86178d862e..c5332e1c84e1 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
@@ -9,8 +9,6 @@
use Drupal\ckeditor\CKEditorPluginBase;
use Drupal\Component\Utility\NestedArray;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
index 47b88c202235..aa23043d7fb0 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
@@ -10,8 +10,6 @@
use Drupal\ckeditor\CKEditorPluginBase;
use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
use Drupal\Component\Utility\NestedArray;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 3eefd376b7c1..03f37e1b36d4 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -13,8 +13,6 @@
use Drupal\Core\Language\Language;
use Drupal\Core\Language\LanguageManager;
use Drupal\editor\Plugin\EditorBase;
-use Drupal\editor\Annotation\Editor;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\editor\Entity\Editor as EditorEntity;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
index 8eccb434aac9..5c106af4791b 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
@@ -9,8 +9,6 @@
use Drupal\ckeditor\CKEditorPluginInterface;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
index ca9d45501716..29867b1f125e 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
@@ -9,8 +9,6 @@
use Drupal\ckeditor\CKEditorPluginButtonsInterface;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a "LlamaButton" plugin, with a toolbar builder-enabled "llama" feature.
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
index d73f9109327e..dcb60a802e70 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
@@ -9,8 +9,6 @@
use Drupal\ckeditor\CKEditorPluginContextualInterface;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
index db6229e0b61b..c2ab8c51b11c 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
@@ -11,8 +11,6 @@
use Drupal\ckeditor\CKEditorPluginContextualInterface;
use Drupal\ckeditor\CKEditorPluginConfigurableInterface;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\ckeditor\Annotation\CKEditorPlugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index ddedfb042be0..62c9e56c9a63 100644
--- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -8,8 +8,6 @@
namespace Drupal\comment\Entity;
use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\comment\CommentInterface;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Field\FieldDefinition;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php
index 9c11291d8c4a..cd3ab530064d 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Action/PublishComment.php
@@ -7,8 +7,6 @@
namespace Drupal\comment\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\comment\CommentInterface;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php
index 6127c8d3ceb0..8cb02be64d2d 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Action/SaveComment.php
@@ -7,8 +7,6 @@
namespace Drupal\comment\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Action\ActionBase;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php
index f8350cc9d979..876850cb3cd5 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishByKeywordComment.php
@@ -7,8 +7,6 @@
namespace Drupal\comment\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\comment\CommentInterface;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php
index 29a0b975b66b..d15c324617cd 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Action/UnpublishComment.php
@@ -7,8 +7,6 @@
namespace Drupal\comment\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\comment\CommentInterface;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php b/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php
index 83ebc377ce26..7a627d127cae 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/entity_reference/selection/CommentSelection.php
@@ -7,10 +7,8 @@
namespace Drupal\comment\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\comment\CommentInterface;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\entity_reference\selection\SelectionBase;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
index a852c5884fe7..7f58b18ef41b 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
index 6ca954082fd5..b74600c24fec 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
@@ -11,7 +11,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to allow linking to a comment.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
index db93d00823ed..a6fe02e238dd 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Depth.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
index 189159dcddc3..c3ddd0502e12 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/EntityLink.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
index 5ba79da0293e..8f8021c85bc0 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LastTimestamp.php
@@ -11,7 +11,6 @@
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to display the timestamp of a comment with the count of comments.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
index 36a79c97ae87..502566f58ebf 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
@@ -9,7 +9,6 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\views\ResultRow;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
index 6344b9e13942..2caeffc58a72 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkApprove.php
@@ -9,7 +9,6 @@
use Drupal\comment\CommentInterface;
use Drupal\views\ResultRow;
-use Drupal\Component\Annotation\PluginID;
/**
* Provides a comment approve link.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
index 94ff815fcc40..eed6baed437c 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
index 6e78e769442f..258b3294d735 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
index f71e76fe94cc..b9fd19e64b98 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkReply.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
index 41d6a4f8314f..7d152795d4ad 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeComment.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index 270136e0070f..ceb187a05438 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -7,7 +7,6 @@
namespace Drupal\comment\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Database\Connection;
use Drupal\comment\CommentInterface;
use Drupal\views\Plugin\views\field\Numeric;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
index 69ba9454046a..3313fd746dce 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastCommentName.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
index 5cced6a26ee1..dabfa7965194 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/StatisticsLastUpdated.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\field;
use Drupal\views\Plugin\views\field\Date;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to display the newer of last comment / node updated.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
index 9d63403a0c90..85344f6648b9 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/Username.php
@@ -11,7 +11,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to allow linking to a user account or homepage.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
index d9ec7a9c5fc8..1f3e3cacb27a 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/NodeComment.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter based on comment node status.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
index 4e263db29c44..4682c9305d28 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/StatisticsLastUpdated.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\Date;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler for the newer of last comment / node updated.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
index a2713dff46c1..56ad35228dc8 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/filter/UserUid.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler to accept a user id to check for nodes that user posted or
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
index ef955c03383f..49113738e4d4 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
@@ -8,8 +8,6 @@
namespace Drupal\comment\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
/**
* Plugin which formats the comments as RSS items.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
index 2f5108a876a1..9d5c7ce283b9 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastCommentName.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\SortPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Sort handler to sort by last comment name which might be in 2 different
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
index 233cdb6b69d7..4d5fd3497fd0 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/StatisticsLastUpdated.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\Date;
-use Drupal\Component\Annotation\PluginID;
/**
* Sort handler for the newer of last comment / entity updated.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
index e030f8d2b3a6..f0d99b27967e 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/sort/Thread.php
@@ -8,7 +8,6 @@
namespace Drupal\comment\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\SortPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Sort handler for ordering by thread.
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
index 1be525ad4b5a..e63ae1558680 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/wizard/Comment.php
@@ -8,8 +8,6 @@
namespace Drupal\comment\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* @todo: replace numbers with constants.
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
index a4c7e8c70076..c781d222b8f7 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
@@ -7,9 +7,6 @@
namespace Drupal\config_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Defines the ConfigQueryTest configuration entity used by the query test.
*
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
index 3df6365595c9..34217a9d4e20 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
@@ -8,8 +8,6 @@
namespace Drupal\config_test\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\config_test\ConfigTestInterface;
/**
diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Category.php b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
index 488f2e71f81b..2c2166acab59 100644
--- a/core/modules/contact/lib/Drupal/contact/Entity/Category.php
+++ b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
@@ -9,8 +9,6 @@
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\contact\CategoryInterface;
/**
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
index 733d7ab28bbf..2bf910e5b81c 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
@@ -8,7 +8,6 @@
namespace Drupal\content_translation\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Entity\EntityInterface;
use Drupal\views\ResultRow;
diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
index 3a14cb14f547..7a40df1c5445 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
@@ -7,7 +7,6 @@
namespace Drupal\contextual\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
index c82b457e5557..10a528ed4c1f 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogMessage.php
@@ -9,7 +9,6 @@
use Drupal\Component\Utility\String;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
index afb2aef5add5..4868fd894bc6 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/field/DblogOperations.php
@@ -8,7 +8,6 @@
namespace Drupal\dblog\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php
index d8d427822f2c..c3d3947cb5ca 100644
--- a/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php
+++ b/core/modules/dblog/lib/Drupal/dblog/Plugin/views/wizard/Watchdog.php
@@ -7,8 +7,6 @@
namespace Drupal\dblog\Plugin\views\wizard;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
/**
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
index 98c9c1a38a5f..1f969a693b69 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
@@ -8,7 +8,6 @@
namespace Drupal\edit\Plugin\InPlaceEditor;
use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
use Drupal\Core\Field\FieldDefinitionInterface;
/**
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php
index 4f294d10a32d..c17e30409d5a 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php
@@ -8,7 +8,6 @@
namespace Drupal\edit\Plugin\InPlaceEditor;
use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
use Drupal\Core\Field\FieldDefinitionInterface;
/**
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
index e4f96ed26251..b286d66f5a25 100644
--- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
+++ b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
@@ -8,7 +8,6 @@
namespace Drupal\edit_test\Plugin\InPlaceEditor;
use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
use Drupal\Core\Field\FieldDefinitionInterface;
/**
diff --git a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
index f6f1c6c586c1..27346c92e07b 100644
--- a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
@@ -8,8 +8,6 @@
namespace Drupal\editor\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\EditorInterface;
/**
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
index 55b0549b91bd..2138b578b8e0 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
@@ -8,8 +8,6 @@
namespace Drupal\editor\Plugin\InPlaceEditor;
use Drupal\Component\Plugin\PluginBase;
-use Drupal\edit\Annotation\InPlaceEditor;
-use Drupal\Core\Annotation\Translation;
use Drupal\edit\EditPluginInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
index ef7e4a2c5c4c..8944cee61037 100644
--- a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
+++ b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
@@ -8,8 +8,6 @@
namespace Drupal\editor_test\Plugin\Editor;
use Drupal\editor\Plugin\EditorBase;
-use Drupal\editor\Annotation\Editor;
-use Drupal\Core\Annotation\Translation;
use Drupal\editor\Entity\Editor as EditorEntity;
/**
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
index 8e2284bc2992..6275fe516b6a 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
@@ -7,8 +7,6 @@
namespace Drupal\entity\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\entity\EntityDisplayModeBase;
use Drupal\entity\EntityFormModeInterface;
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
index 1d17d5e79a0c..1b569a8f2874 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
@@ -7,8 +7,6 @@
namespace Drupal\entity\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\entity\EntityDisplayModeBase;
use Drupal\entity\EntityViewModeInterface;
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php
index fb0beb7f2926..abecaa3f2787 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/entity_reference/selection/SelectionBase.php
@@ -7,13 +7,11 @@
namespace Drupal\entity_reference\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Query\AlterableInterface;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Component\Utility\NestedArray;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\Type\Selection\SelectionInterface;
/**
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
index 496b5ea1ad15..98db6900edfd 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/display/EntityReference.php
@@ -7,8 +7,6 @@
namespace Drupal\entity_reference\Plugin\views\display;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
/**
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
index 638961776370..7ee45e630ca8 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
@@ -7,8 +7,6 @@
namespace Drupal\entity_reference\Plugin\views\row;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\row\Fields;
/**
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php
index c72404c24a0c..03fdf24f1634 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/style/EntityReference.php
@@ -7,8 +7,6 @@
namespace Drupal\entity_reference\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\style\StylePluginBase;
/**
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
index 75b7252edc09..d29319d6f84b 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/FieldList.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler for list field to show the human readable name in the
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
index 83e24d9e32c2..cc43140b3742 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/argument/ListString.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\argument\String;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler for list field to show the human readable name in the
diff --git a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
index 2b1d57c0864b..260925651c0e 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/views/filter/FieldList.php
@@ -8,7 +8,6 @@
namespace Drupal\field\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\ManyToOne;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler which uses list-fields as options.
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/HiddenTestItem.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/HiddenTestItem.php
index e7b1cb3b0200..d3597fd95a65 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/HiddenTestItem.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/HiddenTestItem.php
@@ -7,8 +7,6 @@
namespace Drupal\field_test\Plugin\Field\FieldType;
-use Drupal\Core\Entity\Annotation\FieldType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\field_test\Plugin\Field\FieldType\TestItem;
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/TestItem.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/TestItem.php
index 1c1c4e5ef442..18e6bf4ca936 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/TestItem.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Field/FieldType/TestItem.php
@@ -7,8 +7,6 @@
namespace Drupal\field_test\Plugin\Field\FieldType;
-use Drupal\Core\Entity\Annotation\FieldType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Field\PrepareCacheInterface;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\field\FieldInterface;
diff --git a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Validation/Constraint/TestFieldConstraint.php b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Validation/Constraint/TestFieldConstraint.php
index f6661cddbcdc..61d7b20ab05f 100644
--- a/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Validation/Constraint/TestFieldConstraint.php
+++ b/core/modules/field/tests/modules/field_test/lib/Drupal/field_test/Plugin/Validation/Constraint/TestFieldConstraint.php
@@ -8,9 +8,6 @@
namespace Drupal\field_test\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraints\NotEqualTo;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
/**
* Checks if a value is not equal.
diff --git a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php b/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
index ede77992dafe..ce414ef9660b 100644
--- a/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
+++ b/core/modules/field_ui/tests/modules/field_ui_test/lib/Drupal/field_ui_test/Entity/FieldUITestNoBundle.php
@@ -8,8 +8,6 @@
namespace Drupal\field_ui_test\Entity;
use Drupal\Core\Entity\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the test Field UI class.
diff --git a/core/modules/file/lib/Drupal/file/Entity/File.php b/core/modules/file/lib/Drupal/file/Entity/File.php
index 5f68857278e5..a88207eea0fd 100644
--- a/core/modules/file/lib/Drupal/file/Entity/File.php
+++ b/core/modules/file/lib/Drupal/file/Entity/File.php
@@ -8,9 +8,7 @@
namespace Drupal\file\Entity;
use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Field\FieldDefinition;
use Drupal\Core\Language\Language;
use Drupal\file\FileInterface;
diff --git a/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php b/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php
index 87922a40b3fa..5b642c84df93 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/entity_reference/selection/FileSelection.php
@@ -7,8 +7,6 @@
namespace Drupal\file\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\entity_reference\selection\SelectionBase;
/**
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
index 10a1de006f90..96fa5ab47df8 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/argument/Fid.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\Query\QueryFactory;
use Drupal\views\Plugin\views\argument\Numeric;
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
index add942f4346e..a9ef14c9b4fb 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Extension.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
index 3f28bd84c864..8381a1f184d6 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/File.php
@@ -10,7 +10,6 @@
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
/**
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
index 8c6ab7ed5c5f..08adfac13b65 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
index 4e17445cbf9d..3a547168f7ee 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Status.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
index 119126528fba..c503e5eca4d6 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/Uri.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
index 3da51b37ff4b..c3d0be2b272c 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/filter/Status.php
@@ -7,7 +7,6 @@
namespace Drupal\file\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\filter\InOperator;
/**
diff --git a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php
index 10edac43113c..6cdf557dc330 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/views/wizard/File.php
@@ -8,8 +8,6 @@
namespace Drupal\file\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* Tests creating managed files views with the wizard.
diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
index 95715840d93c..715820b53bee 100644
--- a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
+++ b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
@@ -8,8 +8,6 @@
namespace Drupal\filter\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\filter\FilterFormatInterface;
use Drupal\filter\FilterBag;
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
index 23b3b844cf19..f842896b7f42 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/DataType/FilterFormat.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\DataType;
-use Drupal\Core\TypedData\Annotation\DataType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\TypedData\AllowedValuesInterface;
use Drupal\Core\TypedData\Plugin\DataType\String;
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
index 630e6533e60b..67cede413625 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterAutoP.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
index c776fc4e86e7..d3552a8e7ed7 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterCaption.php
@@ -10,8 +10,6 @@
use Drupal\Component\Utility\String;
use Drupal\Component\Utility\Unicode;
use Drupal\Component\Utility\Xss;
-use Drupal\Core\Annotation\Translation;
-use Drupal\filter\Annotation\Filter;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
index 04c312a41536..62c94017b0ac 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtml.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
index 3f6b8e375b50..7f830264f7d3 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlCorrector.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
index 24e3114d27a4..549bcaa320af 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlEscape.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
index e919939067ed..ba5fb260a795 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterHtmlImageSecure.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
index b48ab2364d9e..a46689306ef4 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterNull.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
index 4b432b6ff64d..f7e20757a55a 100644
--- a/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
+++ b/core/modules/filter/lib/Drupal/filter/Plugin/Filter/FilterUrl.php
@@ -7,8 +7,6 @@
namespace Drupal\filter\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
index ab1f07fa51d6..f360050b0cb8 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestReplace.php
@@ -7,8 +7,6 @@
namespace Drupal\filter_test\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
index 86f4452b3e90..6c94dbf6fee7 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestRestrictTagsAndAttributes.php
@@ -7,8 +7,6 @@
namespace Drupal\filter_test\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
use Drupal\Component\Utility\Xss;
diff --git a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
index 7c3140dfbfea..ad2a30e40e07 100644
--- a/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
+++ b/core/modules/filter/tests/filter_test/lib/Drupal/filter_test/Plugin/Filter/FilterTestUncacheable.php
@@ -7,8 +7,6 @@
namespace Drupal\filter_test\Plugin\Filter;
-use Drupal\filter\Annotation\Filter;
-use Drupal\Core\Annotation\Translation;
use Drupal\filter\Plugin\FilterBase;
/**
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
index 3c7aa2a60b6e..d83f73635abd 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/ActiveTopicsBlock.php
@@ -7,9 +7,6 @@
namespace Drupal\forum\Plugin\Block;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
-
/**
* Provides an 'Active forum topics' block.
*
diff --git a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
index 43c044273304..8b75a837edc2 100644
--- a/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
+++ b/core/modules/forum/lib/Drupal/forum/Plugin/Block/NewTopicsBlock.php
@@ -7,9 +7,6 @@
namespace Drupal\forum\Plugin\Block;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
-
/**
* Provides a 'New forum topics' block.
*
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
index 2efd1cb6fae8..8b0f502ce57c 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/field/HistoryUserTimestamp.php
@@ -11,7 +11,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\node\Plugin\views\field\Node;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to display the marker for new content.
diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
index 1a1c108db969..6b6b0dbdbe02 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
@@ -8,7 +8,6 @@
namespace Drupal\history\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter for new content.
diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
index d25d5cd4def8..aee3ffcdfca6 100644
--- a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
+++ b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
@@ -8,8 +8,6 @@
namespace Drupal\image\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\image\ImageEffectBag;
use Drupal\image\ImageEffectInterface;
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
index 39f58f325891..7996d04e51cc 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
/**
* Crops an image resource.
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php
index 912bec9d688c..4d899c666cc8 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/DesaturateImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
use Drupal\image\ImageEffectBase;
/**
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php
index 27d5538c64a9..da9b17632b4c 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
use Drupal\image\ConfigurableImageEffectInterface;
use Drupal\image\ImageEffectBase;
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php
index 571c5fa3f535..b0e6bf33f26a 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
use Drupal\image\ConfigurableImageEffectInterface;
use Drupal\image\ImageEffectBase;
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php
index 39bd2ec0bf66..7fed9b19468a 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleAndCropImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
/**
* Scales and crops an image resource.
diff --git a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php
index 1dae00819fd1..4316bd09ccbe 100644
--- a/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php
+++ b/core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php
@@ -7,10 +7,8 @@
namespace Drupal\image\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Component\Utility\Image;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
/**
* Scales an image resource.
diff --git a/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php b/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php
index 52731fee4eb6..8fd8632338b6 100644
--- a/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php
+++ b/core/modules/image/tests/modules/image_module_test/lib/Drupal/image_module_test/Plugin/ImageEffect/NullTestImageEffect.php
@@ -7,9 +7,7 @@
namespace Drupal\image_module_test\Plugin\ImageEffect;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Image\ImageInterface;
-use Drupal\image\Annotation\ImageEffect;
use Drupal\image\ImageEffectBase;
/**
diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/lib/Drupal/language/Entity/Language.php
index 8580d87eedeb..6ae43852b8b9 100644
--- a/core/modules/language/lib/Drupal/language/Entity/Language.php
+++ b/core/modules/language/lib/Drupal/language/Entity/Language.php
@@ -7,8 +7,6 @@
namespace Drupal\language\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Language\LanguageManager;
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
index 4f285c95120f..f53c81b072ad 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/Block/LanguageBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\language\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php b/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
index 7cc31db03147..7f4289ea524a 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
@@ -8,8 +8,6 @@
namespace Drupal\language\Plugin\Condition;
use Drupal\Core\Condition\ConditionPluginBase;
-use Drupal\Core\Condition\Annotation\Condition;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Language\Language as Lang;
/**
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
index 34355861e311..a2e0074b40dd 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/argument/LanguageArgument.php
@@ -8,7 +8,6 @@
namespace Drupal\language\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Defines an argument handler to accept a language.
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
index 671efd0ba84c..4b57b9b7e829 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/field/LanguageField.php
@@ -8,7 +8,6 @@
namespace Drupal\language\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
index 3bf59c962be0..6d9aafe54309 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/views/filter/LanguageFilter.php
@@ -8,7 +8,6 @@
namespace Drupal\language\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
-use Drupal\Component\Annotation\PluginID;
/**
* Provides filtering by language.
diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
index b06c583e751f..33105d906def 100644
--- a/core/modules/node/lib/Drupal/node/Entity/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
@@ -10,8 +10,6 @@
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\node\NodeTypeInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the Node type configuration entity.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php
index 50b6c7697a07..2de926c6e4bd 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/AssignOwnerNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
use Drupal\Core\Database\Connection;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
index 47a45f9aabca..603f0972b8e6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/DeleteNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\user\TempStoreFactory;
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
index 8adbdb1c5f81..e490ecb49691 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
index 0b87b382bcc4..0cfc31636a47 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php
index 132e04503ad7..20da55ef51c2 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/PublishNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php
index d374afca531e..b758b72f50ec 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/SaveNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php
index a1700670758b..c4613cef8ed4 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/StickyNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php
index d227c303a864..953b0f427edd 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishByKeywordNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ConfigurableActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php
index 968404f9a486..d462d6de7e1b 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/UnpublishNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php
index ea9305855987..204b9d560cbe 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/UnstickyNode.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
index d5db3651040e..6898961c9b3e 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/RecentContentBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\node\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
index 7bef9bdf7719..ebcacf68e2ab 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Block/SyndicateBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\node\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php b/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
index 59ce54468b60..373920936c94 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
@@ -8,8 +8,6 @@
namespace Drupal\node\Plugin\Condition;
use Drupal\Core\Condition\ConditionPluginBase;
-use Drupal\Core\Condition\Annotation\Condition;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Node Type' condition.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
index 143881fef372..f8d3d29fbfc5 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
@@ -7,7 +7,6 @@
namespace Drupal\node\Plugin\Search;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Config\Config;
use Drupal\Core\Database\Connection;
use Drupal\Core\Database\Query\SelectExtender;
@@ -20,7 +19,6 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Access\AccessibleInterface;
use Drupal\Core\Database\Query\Condition;
-use Drupal\search\Annotation\SearchPlugin;
use Drupal\search\Plugin\SearchPluginBase;
use Drupal\search\Plugin\SearchIndexingInterface;
diff --git a/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php b/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php
index 5a087a884397..dbbda10e2341 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/entity_reference/selection/NodeSelection.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\entity_reference\selection\SelectionBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
index 666cf2617fb0..5941176ac064 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/area/ListingEmpty.php
@@ -7,7 +7,6 @@
namespace Drupal\node\Plugin\views\area;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\area\AreaPluginBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
index ca7aa8c57201..e7f0e1d1b574 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Nid.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler to accept a node id.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
index d06040a52404..cc88b9faed18 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Type.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\String;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler to accept a node type.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
index 048e1f7b10ac..2b4bffd7e89d 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\argument;
use Drupal\user\Plugin\views\argument\Uid;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler to accept a user id to check for nodes that
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
index 225982eae49d..4f117f6aa351 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php
@@ -7,7 +7,6 @@
namespace Drupal\node\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument\Numeric;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php
index 32a7649f8d0a..9845450f24a9 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_default/Node.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\views\argument_default;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php
index 781f75eff830..fdb3415aa65e 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument_validator/Node.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\views\argument_validator;
-use Drupal\views\Annotation\ViewsArgumentValidator;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
index 1b7be8eb6873..3e9d8ae6b61f 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Language.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\Node;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
index fb8b72a91302..9d06cc39996d 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
index eec172abaa60..36dde027ccdc 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\Link;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
index 24dbdef770e3..5f4aee8fbd9b 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/LinkEdit.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\Link;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
index b2de15a2c64c..d0c766343d98 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Node.php
@@ -11,7 +11,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to provide simple renderer that allows linking to a node.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
index 1fcd4cddd3c0..35d67205d7ea 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/NodeBulkForm.php
@@ -9,7 +9,6 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\field\ActionBulkForm;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Cache\Cache;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
index 4c0c6c8f5b6f..26520b81a5ed 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Path.php
@@ -11,7 +11,6 @@
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to present the path to the node.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
index f99f6b7356c1..2f976afa3b18 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Revision.php
@@ -11,7 +11,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\node\Plugin\views\field\Node;
-use Drupal\Component\Annotation\PluginID;
/**
* A basic node_revision handler.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
index 6a733f3a789f..71bb22905e01 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php
@@ -11,7 +11,6 @@
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to present a link to a node revision.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
index 0f8cc641e7b6..899aa83887ac 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\RevisionLink;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
index 13c10fd4cf46..d45e476efa9c 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\RevisionLink;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
index 1f463010d65e..ec46faedd08c 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Type.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\field;
use Drupal\node\Plugin\views\field\Node;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
index b5bf7739350c..09e7c7321b9b 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Access.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter by node_access records.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
index b73de2918024..cd6c38512350 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/Status.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter by published status.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
index b0ceabf03e00..ebfee5cc8637 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php
@@ -8,7 +8,6 @@
namespace Drupal\node\Plugin\views\filter;
use Drupal\user\Plugin\views\filter\Name;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler to check for revisions a certain user has created.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
index 4f7cac44ab43..979d222bf235 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
@@ -7,8 +7,6 @@
namespace Drupal\node\Plugin\views\row;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\row\RowPluginBase;
/**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
index fe796ce871b7..759b9938cd9c 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php
@@ -8,8 +8,6 @@
namespace Drupal\node\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* @todo: replace numbers with constants.
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php
index 13465990f1d5..d4c31cba05a8 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php
@@ -8,8 +8,6 @@
namespace Drupal\node\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* @todo: replace numbers with constants.
diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
index 214acc1c4e34..26a73acfdc3c 100644
--- a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
+++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
@@ -8,8 +8,6 @@
namespace Drupal\picture\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\picture\PictureMappingInterface;
/**
diff --git a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
index 3b409dd36068..cdb70c5a1d4a 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
@@ -8,8 +8,6 @@
namespace Drupal\rdf\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\rdf\RdfMappingInterface;
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php
index d6219f994c49..8b7cb990ca43 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/DBLogResource.php
@@ -7,8 +7,6 @@
namespace Drupal\rest\Plugin\rest\resource;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\rest\Plugin\ResourceBase;
use Drupal\rest\ResourceResponse;
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php
index 2d2f3535dbc9..ae90d745ee07 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/rest/resource/EntityResource.php
@@ -7,8 +7,6 @@
namespace Drupal\rest\Plugin\rest\resource;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityStorageException;
use Drupal\rest\Plugin\ResourceBase;
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
index cef895377f02..09111bf25694 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/display/RestExport.php
@@ -10,8 +10,6 @@
use Drupal\Core\KeyValueStore\StateInterface;
use Drupal\Core\Routing\RouteProviderInterface;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\ContentNegotiation;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\PathPluginBase;
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php
index 80da152410d7..1d96d2b3056e 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataEntityRow.php
@@ -9,8 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\row\RowPluginBase;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
/**
* Plugin which displays entities as raw data.
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
index 73291ca77d9d..771aef1fbacd 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/row/DataFieldRow.php
@@ -10,8 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\row\RowPluginBase;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
/**
* Plugin which displays fields as raw data.
diff --git a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php b/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
index 605006ad0571..2e7ac89f82ac 100644
--- a/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
+++ b/core/modules/rest/lib/Drupal/rest/Plugin/views/style/Serializer.php
@@ -10,8 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\style\StylePluginBase;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Serializer\SerializerInterface;
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
index 70a97defb0cf..f2dc58b31ba9 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/argument/Search.php
@@ -8,7 +8,6 @@
namespace Drupal\search\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument that accepts query keys for search.
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
index e6646d16cd96..0fad572d188c 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/field/Score.php
@@ -8,7 +8,6 @@
namespace Drupal\search\Plugin\views\field;
use Drupal\views\Plugin\views\field\Numeric;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
index ffef447a9950..708595e76c31 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
@@ -9,7 +9,6 @@
use Drupal\search\SearchQuery;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to provide simple renderer that allows linking to a node.
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php
index da2f8655b3a7..ba388cb22b19 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php
@@ -8,8 +8,6 @@
namespace Drupal\search\Plugin\views\row;
use Drupal\views\Plugin\views\row\RowPluginBase;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
/**
* Plugin which performs a node_view on the resulting object.
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
index f3737bc30262..589d499a8f00 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/sort/Score.php
@@ -8,7 +8,6 @@
namespace Drupal\search\Plugin\views\sort;
use Drupal\views\Plugin\views\sort\SortPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to provide simple renderer that allows linking to a node.
diff --git a/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php
index 2ea35eb1ebfe..e30b10e31d37 100644
--- a/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php
+++ b/core/modules/search/tests/modules/search_extra_type/lib/Drupal/search_extra_type/Plugin/Search/SearchExtraTypeSearch.php
@@ -7,11 +7,9 @@
namespace Drupal\search_extra_type\Plugin\Search;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Config\Config;
use Drupal\Core\Plugin\PluginFormInterface;
use Drupal\search\Plugin\SearchPluginBase;
-use Drupal\search\Annotation\SearchPlugin;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
index 4a5efe2cb268..cb64ec0f6a5d 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Plugin/Block/ShortcutsBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\shortcut\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Shortcut' block.
diff --git a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
index 659d755153e0..64f71c4de874 100644
--- a/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/lib/Drupal/statistics/Plugin/Block/StatisticsPopularBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\statistics\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php
index 4962a92d97d8..a313158cb023 100644
--- a/core/modules/system/lib/Drupal/system/Entity/Action.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Action.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\system\ActionConfigEntityInterface;
use Drupal\Core\Action\ActionBag;
diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
index 447f800f797c..5b052523c63d 100644
--- a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
+++ b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
@@ -11,8 +11,6 @@
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\system\DateFormatInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the Date Format configuration entity class.
diff --git a/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Entity/Menu.php
index 5f6d0756f893..fa5d7fda54d7 100644
--- a/core/modules/system/lib/Drupal/system/Entity/Menu.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Menu.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\system\MenuInterface;
/**
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
index b6510e351d7c..0453f169f9d0 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Tar.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Archiver;
use Drupal\Component\Archiver\Tar as BaseTar;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a archiver implementation for .tar files.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
index 299774c5df42..5865653b28ef 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Archiver/Zip.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Archiver;
use Drupal\Component\Archiver\Zip as BaseZip;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a archiver implementation for .zip files.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
index ec239a61c16c..814fce5f530a 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBreadcrumbBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a block to display the breadcrumbs.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
index f7b389d91f09..f669e6158d4a 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemHelpBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
index 26d17f7fe570..a64951ae54b3 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMainBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Main page content' block.
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
index 02976add9b18..65a194df9903 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemMenuBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
index 30a6be225323..742af7b607f0 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemPoweredByBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\system\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
/**
* Provides a 'Powered by Drupal' block.
diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php b/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php
index 41484521ca33..7f18b572529f 100644
--- a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php
+++ b/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/NoType.php
@@ -7,8 +7,6 @@
namespace Drupal\action_test\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php b/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php
index 71a42e47983f..e3d296f5eb12 100644
--- a/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php
+++ b/core/modules/system/tests/modules/action_test/lib/Drupal/action_test/Plugin/Action/SaveEntity.php
@@ -7,8 +7,6 @@
namespace Drupal\action_test\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
index 7a81687f0881..8b33daf7ec50 100644
--- a/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
+++ b/core/modules/system/tests/modules/entity_cache_test_dependency/lib/Drupal/entity_cache_test_dependency/Entity/EntityCacheTest.php
@@ -8,8 +8,6 @@
namespace Drupal\entity_cache_test_dependency\Entity;
use Drupal\Core\Entity\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the EntityCacheTest class.
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
index 836eafb889ba..6ca66a437031 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTest.php
@@ -8,8 +8,6 @@
namespace Drupal\entity_test\Entity;
use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Field\FieldDefinition;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\Core\Language\Language;
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
index 642439a0b062..460b2e7b4ec8 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestCache.php
@@ -7,8 +7,6 @@
namespace Drupal\entity_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Language\Language;
/**
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
index 084f062b8394..d5f22cc6bb09 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestDefaultAccess.php
@@ -7,9 +7,6 @@
namespace Drupal\entity_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Defines a test entity class with no access controller.
*
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
index e09743e8b003..b022a1752648 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabel.php
@@ -7,9 +7,6 @@
namespace Drupal\entity_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Test entity class.
*
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
index b99ff7162587..aa96db3ca8de 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestLabelCallback.php
@@ -7,9 +7,6 @@
namespace Drupal\entity_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Test entity class.
*
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
index f80caa0eb610..adfef6e215ea 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMul.php
@@ -9,8 +9,6 @@
use Drupal\Core\Field\FieldDefinition;
use Drupal\entity_test\Entity\EntityTest;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the test entity class.
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
index 7b6db36eb3a1..e0dce68f1a36 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestMulRev.php
@@ -9,8 +9,6 @@
use Drupal\Core\Field\FieldDefinition;
use Drupal\entity_test\Entity\EntityTestRev;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the test entity class.
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
index 63db9d6bdf8a..ce97a1ecfd4d 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestNoLabel.php
@@ -7,9 +7,6 @@
namespace Drupal\entity_test\Entity;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
-
/**
* Test entity class.
*
diff --git a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
index 2518b42c8555..a31dcdc127a8 100644
--- a/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
+++ b/core/modules/system/tests/modules/entity_test/lib/Drupal/entity_test/Entity/EntityTestRev.php
@@ -9,8 +9,6 @@
use Drupal\Core\Field\FieldDefinition;
use Drupal\entity_test\Entity\EntityTest;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
/**
* Defines the test entity class.
diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
index ebe88186bec6..ee5d594997f1 100644
--- a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
+++ b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksSettingsSub1.php
@@ -7,9 +7,7 @@
namespace Drupal\menu_test\Plugin\Menu\LocalTask;
-use Drupal\Core\Annotation\Menu\LocalTask;
use Drupal\Core\Menu\LocalTaskDefault;
-use Drupal\Core\Annotation\Translation;
class TestTasksSettingsSub1 extends LocalTaskDefault {
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php
index b3be67cd1e6b..6811143e15be 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample1.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test;
-use Drupal\Component\Annotation\Plugin;
-
/**
* Provides a test plugin within a custom directory.
*
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php
index f15fb3a628a9..e424c2d727de 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/CustomDirectoryExample2.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test;
-use Drupal\Component\Annotation\Plugin;
-
/**
* Provides a test plugin within a custom directory.
*
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php
index 269f3edb46a2..d0904c492bcc 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example1.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\custom_annotation;
-use Drupal\plugin_test\Plugin\Annotation\PluginExample;
-
/**
* Provides a test plugin with a custom annotation.
*
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php
index 1d668f7adb9a..1a7fd64bff06 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/custom_annotation/Example2.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\custom_annotation;
-use Drupal\plugin_test\Plugin\Annotation\PluginExample;
-
/**
* Provides a test plugin with a custom annotation.
*
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php
index fd3fb2f92eed..9aabeca1705b 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Apple.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
-use Drupal\Component\Annotation\Plugin;
-
/**
* @Plugin(
* id = "apple",
@@ -17,4 +15,3 @@
* )
*/
class Apple {}
-
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php
index 55f1d12e99df..4801da5ba108 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Banana.php
@@ -7,9 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
/**
* @Plugin(
* id = "banana",
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php
index 1352983dccbf..d22b90a98dae 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Cherry.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
-use Drupal\Component\Annotation\Plugin;
-
/**
* @Plugin(
* id = "cherry",
@@ -17,4 +15,3 @@
* )
*/
class Cherry {}
-
diff --git a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php
index 02b8a36d01c9..27d7d00aff6e 100644
--- a/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php
+++ b/core/modules/system/tests/modules/plugin_test/lib/Drupal/plugin_test/Plugin/plugin_test/fruit/Orange.php
@@ -7,8 +7,6 @@
namespace Drupal\plugin_test\Plugin\plugin_test\fruit;
-use Drupal\Component\Annotation\Plugin;
-
/**
* @Plugin(
* id = "orange",
@@ -17,4 +15,3 @@
* )
*/
class Orange {}
-
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
index 4fa499e6e2f6..bf85ab866769 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
@@ -8,9 +8,7 @@
namespace Drupal\taxonomy\Entity;
use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Field\FieldDefinition;
use Drupal\Core\Language\Language;
use Drupal\Core\TypedData\DataDefinition;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
index b97e89268667..12facd4c788e 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
@@ -9,8 +9,6 @@
use Drupal\Core\Config\Entity\ConfigEntityBase;
use Drupal\Core\Entity\EntityStorageControllerInterface;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\taxonomy\VocabularyInterface;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
index e7205dd4e9c8..7894242fc521 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/entity_reference/selection/TermSelection.php
@@ -7,10 +7,8 @@
namespace Drupal\taxonomy\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\entity_reference\selection\SelectionBase;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
index 4cfd25ad20d8..abe16ead1e30 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTid.php
@@ -7,7 +7,6 @@
namespace Drupal\taxonomy\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\argument\ManyToOne;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
index a732cf362ed8..84c9415e76ab 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepth.php
@@ -8,7 +8,6 @@
namespace Drupal\taxonomy\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler for taxonomy terms with depth.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
index db159d73e1ba..5de76edfeb9e 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/IndexTidDepthModifier.php
@@ -8,7 +8,6 @@
namespace Drupal\taxonomy\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler for to modify depth for a previous term.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
index 5ff4aafc97a5..d1f75c6c33f5 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/Taxonomy.php
@@ -8,7 +8,6 @@
namespace Drupal\taxonomy\Plugin\views\argument;
use Drupal\views\Plugin\views\argument\Numeric;
-use Drupal\Component\Annotation\PluginID;
/**
* Argument handler for basic taxonomy tid.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
index 618ddfdc5427..aa9a5825474c 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument/VocabularyVid.php
@@ -7,7 +7,6 @@
namespace Drupal\taxonomy\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\argument\Numeric;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
index 2eb6577c7fd1..57ad4285d229 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_default/Tid.php
@@ -9,8 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
index b2d4e33d91c0..220353701f2a 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Language.php
@@ -7,7 +7,6 @@
namespace Drupal\taxonomy\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
index 54b5ad58775a..b08a93f620ab 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/LinkEdit.php
@@ -11,7 +11,6 @@
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to present a term edit link.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
index be01032bc2b4..1c5b79c50e6d 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
@@ -12,7 +12,6 @@
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to provide simple renderer that allows linking to a taxonomy
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index 8cbb9fbbe098..bb6d43bc7071 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\field\PrerenderList;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to display all taxonomy terms of a node.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index f4219046d05b..ec4b127dd570 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -9,7 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\filter\ManyToOne;
use Drupal\Component\Utility\Tags;
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
index 3bae73d1723e..5aa1cc026add 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTidDepth.php
@@ -7,8 +7,6 @@
namespace Drupal\taxonomy\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Filter handler for taxonomy terms with depth.
*
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
index e46e18e1d1e0..91fa52f9ab92 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/relationship/NodeTermData.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\relationship\RelationshipPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Relationship handler to return the taxonomy terms of nodes.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
index a8f7fd2f5be7..fa4bfa1dbe7e 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/wizard/TaxonomyTerm.php
@@ -8,8 +8,6 @@
namespace Drupal\taxonomy\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* Tests creating taxonomy views with the wizard.
diff --git a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
index 35a33b2318db..8cefe1649dab 100644
--- a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
@@ -8,8 +8,6 @@
namespace Drupal\tour\Entity;
use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Entity\Annotation\EntityType;
-use Drupal\Core\Annotation\Translation;
use Drupal\tour\TipsBag;
use Drupal\tour\TourInterface;
diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php b/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
index 5ae155845b17..d8834906aa47 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
+++ b/core/modules/tour/lib/Drupal/tour/Plugin/tour/tip/TipPluginText.php
@@ -7,10 +7,8 @@
namespace Drupal\tour\Plugin\tour\tip;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Utility\Token;
-use Drupal\tour\Annotation\Tip;
use Drupal\tour\TipPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
index 7da574fff714..79ed03cf7b98 100644
--- a/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
+++ b/core/modules/tour/tests/tour_test/lib/Drupal/tour_test/Plugin/tour/tip/TipPluginImage.php
@@ -7,8 +7,6 @@
namespace Drupal\tour_test\Plugin\tour\tip;
-use Drupal\Core\Annotation\Translation;
-use Drupal\tour\Annotation\Tip;
use Drupal\tour\TipPluginBase;
/**
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
index 1df6f947796e..05c779ae7d3a 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/UserUid.php
@@ -7,7 +7,6 @@
namespace Drupal\tracker\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\comment\Plugin\views\argument\UserUid as CommentUserUid;
/**
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
index 792346e75b39..2fee1bf9c28e 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/UserUid.php
@@ -7,7 +7,6 @@
namespace Drupal\tracker\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\user\Plugin\views\filter\Name;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php
index 7757c2301fc7..acf4dd99425c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/AddRoleUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\user\Plugin\Action\ChangeUserRoleBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php
index 4527e7237a64..a488f3124364 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/BlockUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
index 009cb5bb7564..b404ba0a32a9 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/CancelUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\user\TempStoreFactory;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php
index 80c1aa351188..e63a70a936ec 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/RemoveRoleUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\user\Plugin\Action\ChangeUserRoleBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php b/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php
index 43ddca9c603c..9c30ebcd83f6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Action/UnblockUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\Action;
-use Drupal\Core\Annotation\Action;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Action\ActionBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
index 30b83c8c46c8..b6af908bd243 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserNewBlock.php
@@ -8,8 +8,6 @@
namespace Drupal\user\Plugin\Block;
use Drupal\block\BlockBase;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Session\AccountInterface;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php b/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
index 75399f88b72c..ea5f41798f0a 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Search/UserSearch.php
@@ -7,13 +7,11 @@
namespace Drupal\user\Plugin\Search;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Connection;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Access\AccessibleInterface;
-use Drupal\search\Annotation\SearchPlugin;
use Drupal\search\Plugin\SearchPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php
index 652abaaee7e5..e3b8b0ba9e0e 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserMailUnique.php
@@ -8,9 +8,6 @@
namespace Drupal\user\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
/**
* Checks if a user's e-mail address is unique on the site.
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php
index a70908758e0d..8aba0cf15c1e 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameConstraint.php
@@ -8,9 +8,6 @@
namespace Drupal\user\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
/**
* Checks if a value is a valid user name.
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php
index 72bfcb8bb8bb..d05d5a64d386 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Validation/Constraint/UserNameUnique.php
@@ -8,9 +8,6 @@
namespace Drupal\user\Plugin\Validation\Constraint;
use Symfony\Component\Validator\Constraint;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-
/**
* Checks if a user name is unique on the site.
diff --git a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php
index 2aeee7800c54..f14bc4e72fc6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/entity_reference/selection/UserSelection.php
@@ -7,11 +7,9 @@
namespace Drupal\user\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Database;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\entity_reference\selection\SelectionBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php
index 3c75fed61bab..5dcc43dc587c 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Permission.php
@@ -7,11 +7,8 @@
namespace Drupal\user\Plugin\views\access;
-
-use Drupal\views\Annotation\ViewsAccess;
use Drupal\Core\Session\AccountInterface;
use Drupal\views\Plugin\views\access\AccessPluginBase;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Routing\Route;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php
index 1c4fecc4a60b..aa4f1ce93fef 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/access/Role.php
@@ -8,8 +8,6 @@
namespace Drupal\user\Plugin\views\access;
use Drupal\views\Plugin\views\access\AccessPluginBase;
-use Drupal\views\Annotation\ViewsAccess;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\Routing\Route;
use Drupal\Core\Session\AccountInterface;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
index 8c971088c1cd..743d6cd05c24 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument/RolesRid.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Component\Utility\String;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\argument\ManyToOne;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
index 024f40d0063f..e763bae2cbd4 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_default/CurrentUser.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\views\argument_default;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
index 6596dad2fed0..d3852368f273 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php
@@ -7,8 +7,6 @@
namespace Drupal\user\Plugin\views\argument_validator;
-use Drupal\views\Annotation\ViewsArgumentValidator;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
index 46c758006b4b..6a9af10a4c6f 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Language.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
index 88102b88fefc..2d3954243d2a 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
@@ -12,7 +12,6 @@
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\Component\Annotation\PluginID;
/**
* Field handler to present a link to the user.
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
index 2449acb8b3f9..5d21ccfa83d6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
@@ -8,7 +8,6 @@
namespace Drupal\user\Plugin\views\field;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
index d58c7673637e..6442691e813f 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
@@ -8,7 +8,6 @@
namespace Drupal\user\Plugin\views\field;
use Drupal\Core\Entity\EntityInterface;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
index 1520359e8772..102169dd74ed 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Mail.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
index fb374ba33472..2ce056b16ef6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Name.php
@@ -9,7 +9,6 @@
use Drupal\user\Plugin\views\field\User;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
index 2c0529b1dc4a..dc55c92203a3 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
index 22c2819d1304..ec9df998759f 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Database\Connection;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
index 159b4aa1d855..7077685e3997 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
@@ -9,7 +9,6 @@
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
index ea6d67a2fd89..b548cd5c8764 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserBulkForm.php
@@ -9,7 +9,6 @@
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\field\ActionBulkForm;
-use Drupal\Component\Annotation\PluginID;
use Drupal\user\UserInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
index d88fb8b83695..05c762f8cade 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/UserData.php
@@ -12,7 +12,6 @@
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\user\UserDataInterface;
-use Drupal\Component\Annotation\PluginID;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
index ce9d26ef2069..edade48dc2d1 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Current.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\filter\BooleanOperator;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
index d033e724fdd0..b9a7320707ec 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
@@ -8,7 +8,6 @@
namespace Drupal\user\Plugin\views\filter;
use Drupal\views\Plugin\views\filter\InOperator;
-use Drupal\Component\Annotation\PluginID;
/**
* Filter handler for usernames.
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
index 6d763fa01029..7a8d340fd84d 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Permissions.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Component\Utility\String;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\views\Plugin\views\filter\ManyToOne;
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
index ffc22f96f85f..0a2e0662de2e 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Roles.php
@@ -7,7 +7,6 @@
namespace Drupal\user\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\filter\ManyToOne;
/**
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php
index 1694c32f47a0..36de93d4947f 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/wizard/Users.php
@@ -8,8 +8,6 @@
namespace Drupal\user\Plugin\views\wizard;
use Drupal\views\Plugin\views\wizard\WizardPluginBase;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
/**
* @todo: replace numbers with constants.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index dac57a0c0107..4d521a9c9b3a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\Block;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Config\Entity\Query\Query;
use Drupal\Component\Utility\Xss;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
index 8c25e9f85ab8..4796f692e682 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsExposedFilterBlock.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\Block;
-use Drupal\block\Annotation\Block;
-use Drupal\Core\Annotation\Translation;
-
/**
* Provides a 'Views Exposed Filter' block.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
index 0b5d037f3d1e..3cc2d36ed2eb 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/entity_reference/selection/ViewsSelection.php
@@ -7,11 +7,9 @@
namespace Drupal\views\Plugin\entity_reference\selection;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\entity_reference\Annotation\EntityReferenceSelection;
use Drupal\entity_reference\Plugin\Type\Selection\SelectionInterface;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
index 1250ea3d10bf..9e82624d1b63 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Broken.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* A special handler to take the place of missing or broken handlers.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
index ef1cd2160ee2..3bf75efba0ef 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Date.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Database\Database;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
index c06a149c33e7..d7b6df40f2e8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a day (DD)
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
index 07c9ff5894bf..a7a61ff8e3b8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Formula.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
index b29c58941366..3403549d4284 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a full date (CCYYMMDD)
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
index cd8dd5e759cc..558cb1a16636 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/GroupByNumeric.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Simple handler for arguments using group by.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
index 63802b5989c4..5a21b923279b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/ManyToOne.php
@@ -9,7 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ManyToOneHelper;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
index 2283c4cac84e..036e2e673ebd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a month (MM)
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
index c3f168b28f89..8d935e0986d0 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Null.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler that ignores the argument.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
index 96140db1742d..21d34bd8250d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Numeric.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Basic argument handler for arguments that are numeric. Incorporates
* break_phrase.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
index b9b419556d77..607ec1d8f1a8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/Standard.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Default implementation of the base argument plugin.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
index 3e0704914486..88266d15b183 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/String.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ManyToOneHelper;
-use Drupal\Component\Annotation\PluginID;
/**
* Basic argument handler to implement string arguments that may have length
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
index 29fa35b19c58..efddb962a90b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a week.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
index 884b390565e6..184271e9f262 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a year (CCYY)
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
index 56f8cb60021e..76bf192fec2b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Argument handler for a year plus month (CCYYMM)
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
index ed2b20b587cf..4dcb180dc320 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Fixed.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\argument_default;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
-
/**
* The fixed argument default handler.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php
index 0b2f60dc6178..43369937c813 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_default/Raw.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\argument_default;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
use Drupal\Core\Path\AliasManagerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php
index 2acea7fa3e8c..b53ba9305894 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/None.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\argument_validator;
-use Drupal\views\Annotation\ViewsArgumentValidator;
-use Drupal\Core\Annotation\Translation;
-
/**
* Do not validate the argument.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
index a1f2a46a61ba..ff7e5a3ef442 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Numeric.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\argument_validator;
-use Drupal\views\Annotation\ViewsArgumentValidator;
-use Drupal\Core\Annotation\Translation;
-
/**
* Validate whether an argument is numeric or not.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php
index 11e5d0c8d10f..ed0256b717ae 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/None.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\cache;
-use Drupal\views\Annotation\ViewsCache;
-use Drupal\Core\Annotation\Translation;
-
/**
* Caching plugin that provides no caching at all.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php
index 05dcefc3963e..009a178718b2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/Time.php
@@ -7,9 +7,7 @@
namespace Drupal\views\Plugin\views\cache;
-use Drupal\views\Annotation\ViewsCache;
use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Annotation\Translation;
/**
* Simple caching of query results for Views displays.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php
index 8f581117ccbd..bd62f351700d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Attachment.php
@@ -8,8 +8,6 @@
namespace Drupal\views\Plugin\views\display;
use Drupal\views\ViewExecutable;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
/**
* The plugin that handles an attachment display.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
index cc9ad745e71c..c4a49f53e207 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
-
/**
* A plugin to handle defaults on a view.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php
index 6b970a45ddbf..c1cd149ef539 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Embed.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
-
/**
* The plugin that handles an embed display.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
index cba381073609..7915204e8ad3 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -10,8 +10,6 @@
use Drupal\views\ViewExecutable;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
/**
* The plugin that handles a feed, such as RSS or atom.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php
index 3c247d800358..8075c27ff6ed 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/Page.php
@@ -7,10 +7,8 @@
namespace Drupal\views\Plugin\views\display;
-use Drupal\views\Annotation\ViewsDisplay;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Drupal\Core\Annotation\Translation;
/**
* The plugin that handles a full page.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
index 7c61ad98cc8f..234a0a061af5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DefaultDisplayExtender.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\display_extender;
-use Drupal\views\Annotation\ViewsDisplayExtender;
-use Drupal\Core\Annotation\Translation;
-
/**
* @todo
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index de7dc8be8a3d..26c59f746ffe 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -9,7 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\PluginBase;
-use Drupal\Core\Annotation\Translation;
/**
* @todo.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
index f636c51f98fb..8de9d357f315 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/Basic.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\exposed_form;
-use Drupal\views\Annotation\ViewsExposedForm;
-use Drupal\Core\Annotation\Translation;
-
/**
* Exposed form plugin that provides a basic exposed form.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 158d0c5fcd82..5508f3ada531 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\exposed_form;
-use Drupal\views\Annotation\ViewsExposedForm;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Views;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php
index a6eef9054779..8932037a95a8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/ActionBulkForm.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\system\Plugin\views\field\BulkFormBase;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
index 2f94593e9274..c0676a314346 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
@@ -10,7 +10,6 @@
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* A handler to provide proper displays for booleans.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
index f44871021a12..062927f447c8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Broken.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
-
/**
* A special handler to take the place of missing or broken handlers.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
index daef3617c45f..365a8d8b7860 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Counter.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
index 7a779d3eabed..94a11e8f3104 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
index 2ef89a82a5a5..7ae6005f5bf5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Date.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Entity\EntityStorageControllerInterface;
use Drupal\views\ResultRow;
use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
index ab736b6d14b2..c35c06d4850b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Dropbutton.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
index bc37f335e54d..7ac209b3e55b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
index 98efde475220..ba38c2a1907b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FileSize.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
index 7acd40b2c042..8117e7ab0cac 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
index 8145321fe137..020495297fa4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Markup.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ResultRow;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
index 11a4a23e25e4..83bc70741d78 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Numeric.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
index ca2021cbe4c7..c3720ed2f648 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Field handler to provide a list of items.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
index db67c57ded6a..9d541fdab839 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Serialized.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
index 0e9831398bae..1a260270bac7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Standard.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Default implementation of the base field plugin.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
index bbd1a96e5646..3074ffdfef45 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/TimeInterval.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
index 5095f8d4ac15..c448b86d143b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Url.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
index 659244225d7f..b29b3f5dc0bf 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Xss.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Plugin\views\field;
use Drupal\views\Plugin\views\field\FieldPluginBase;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ResultRow;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index 0d787a8a29d4..a6b18ffa4d69 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
index 5f3537dee459..de77678f99a2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperatorString.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Simple filter to handle matching of boolean values.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
index 4ba007743281..e4b1333f70a8 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Broken.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
index 3c1f54fa08fd..402e7225ce55 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
index ceafdb88c285..bf660dfde277 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Combine.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Filter handler which allows to search on multiple fields.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
index 2d6b0d357571..5ce94ad62623 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Filter to handle dates stored as a timestamp.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
index ec68ab2025d7..22707f8621bd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Simple filter to handle equal to / not equal to filters
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 91a9d84118fd..4a181718350e 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -10,7 +10,6 @@
use Drupal\views\Plugin\views\HandlerBase;
use Drupal\Component\Utility\String;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Component\Annotation\Plugin;
use Drupal\views\ViewExecutable;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
index f1069af907df..4e94db06e1c4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/GroupByNumeric.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Simple filter to handle greater than/less than filters
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
index 537e6c852ee5..84d8723799c4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
index 1bcb36f7be29..a7ffbf664d4f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
@@ -10,7 +10,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ManyToOneHelper;
-use Drupal\Component\Annotation\PluginID;
/**
* Complex filter to handle filtering for many to one relationships,
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
index a257058fff92..18590d3d70e5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Plugin\views\filter;
use Drupal\Core\Database\Database;
-use Drupal\Component\Annotation\PluginID;
/**
* Simple filter to handle greater than/less than filters
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
index a2328f327ed6..c55d7ce755be 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Standard.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Default implementation of the base filter plugin.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
index 90acd1b0bae4..3c6735ea7405 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Plugin\views\filter;
use Drupal\Core\Database\Database;
-use Drupal\Component\Annotation\PluginID;
/**
* Basic textfield filter to handle string filtering commands
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php
index e68b509c3043..fda4c4e552d5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Full.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\pager;
-use Drupal\views\Annotation\ViewsPager;
-use Drupal\Core\Annotation\Translation;
-
/**
* The plugin to handle full pager.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
index 7cd0c65d7026..f0195ae203b6 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Mini.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\pager;
-use Drupal\views\Annotation\ViewsPager;
-use Drupal\Core\Annotation\Translation;
-
/**
* The plugin to handle mini pager.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php
index 8594770b768b..e5ccad348b05 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/None.php
@@ -9,8 +9,6 @@
use Drupal\views\ViewExecutable;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Annotation\ViewsPager;
-use Drupal\Core\Annotation\Translation;
/**
* Plugin for views without pagers.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php
index ccf005d3386e..ded554f38833 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/Some.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\pager;
-use Drupal\views\Annotation\ViewsPager;
-use Drupal\Core\Annotation\Translation;
-
/**
* Plugin for views without pagers.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
index 820ec66820a5..265a025d724a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/query/Sql.php
@@ -13,8 +13,6 @@
use Drupal\Core\Database\DatabaseExceptionWrapper;
use Drupal\views\Plugin\views\join\JoinPluginBase;
use Drupal\views\Plugin\views\HandlerBase;
-use Drupal\views\Annotation\ViewsQuery;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\ViewExecutable;
use Drupal\views\Views;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php
index 85d8b7e14f45..d49b2137acc7 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/Fields.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\row;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
-
/**
* The basic 'fields' row plugin
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
index a9571d106122..9c3b7ff9f29d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\row;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
-
/**
* Renders an RSS item based on fields.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
index dd832dc4f1cc..234ee57b5465 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Broken.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
-
/**
* A special handler to take the place of missing or broken handlers.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
index bfb95c89eb2d..6d1fbeb54961 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Date.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Basic sort handler for dates.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
index 1c528c8a34e0..524bff292f08 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/GroupByNumeric.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\ViewExecutable;
use Drupal\views\Views;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
index 6835abe3b8fd..df0d9de67149 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/MenuHierarchy.php
@@ -7,10 +7,8 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Views;
-
/**
* Sort in menu hierarchy order.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
index 8e1eca182a24..147e004209dd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Random.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Handle a random sort.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index e847153401d7..3273b2b18b91 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Plugin\views\sort;
use Drupal\views\Plugin\views\HandlerBase;
-use Drupal\Component\Annotation\Plugin;
/**
* @defgroup views_sort_handlers Views sort handlers
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
index 1a6cf6914ab6..5f7268e71a2f 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/Standard.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Plugin\views\sort;
-use Drupal\Component\Annotation\PluginID;
-
/**
* Default implementation of the base sort plugin.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
index 4b0841f28d06..693c02a91c14 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/DefaultSummary.php
@@ -8,8 +8,6 @@
namespace Drupal\views\Plugin\views\style;
use Drupal\views\Plugin\views\style\StylePluginBase;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
/**
* The default style plugin for summaries.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php
index cbae11bc67af..11918f710b1d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Grid.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
-
/**
* Style plugin to render each item in a grid cell.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php
index 55666649cc39..9d1890313005 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/HtmlList.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
-
/**
* Style plugin to render each item in an ordered or unordered list.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php
index 136e5bbb2276..adb23b25ed44 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Rss.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
-
/**
* Default style plugin to render an RSS feed.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index ac0f8987b2d1..c3e1be85657d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -10,8 +10,6 @@
use Drupal\views\Plugin\views\PluginBase;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\wizard\WizardInterface;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\ViewExecutable;
/**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
index f381dc171ea6..a903d76526f5 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
@@ -9,8 +9,6 @@
use Drupal\Component\Plugin\Discovery\DiscoveryInterface;
use Drupal\views\Plugin\views\wizard\WizardInterface;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
index 6eec04d445d9..3c7d47b2edab 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/UnformattedSummary.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
-
/**
* The default style plugin for summaries.
*
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php
index c2e034ece716..b0ede3fe6979 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/Standard.php
@@ -7,9 +7,6 @@
namespace Drupal\views\Plugin\views\wizard;
-use Drupal\views\Annotation\ViewsWizard;
-use Drupal\Core\Annotation\Translation;
-
/**
* @ViewsWizard(
* id = "standard",
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
index 6d7dec4ad7fe..c45d77ef6504 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/access/StaticTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\access;
-use Drupal\Core\Annotation\Translation;
-use Drupal\views\Annotation\ViewsAccess;
use Drupal\Core\Session\AccountInterface;
use Drupal\views\Plugin\views\access\AccessPluginBase;
use Symfony\Component\Routing\Route;
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
index 3e697d263e1f..f9da30e1f2b8 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/area/TestExample.php
@@ -8,7 +8,6 @@
namespace Drupal\views_test_data\Plugin\views\area;
use Drupal\views\Plugin\views\area\AreaPluginBase;
-use Drupal\Component\Annotation\PluginID;
/**
* Test area plugin.
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
index ee9dd3a73bad..ece75e078569 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/argument_default/ArgumentDefaultTest.php
@@ -8,8 +8,6 @@
namespace Drupal\views_test_data\Plugin\views\argument_default;
use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
-use Drupal\views\Annotation\ViewsArgumentDefault;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a argument default test plugin.
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
index c6f897b20868..d79cf07252b2 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayNoAreaTest.php
@@ -7,9 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\display;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
-
/**
* Defines a Display test plugin with areas disabled.
*
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
index aaa9e0f01984..a297fc332363 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display/DisplayTest.php
@@ -8,8 +8,6 @@
namespace Drupal\views_test_data\Plugin\views\display;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Annotation\ViewsDisplay;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a Display test plugin.
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
index 42519715eb1d..b13a2f8a2787 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest.php
@@ -7,9 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\display_extender;
-use Drupal\views\Annotation\ViewsDisplayExtender;
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\display_extender\DisplayExtenderPluginBase;
/**
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
index e1f950675d1b..ffe3a77de8e7 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/display_extender/DisplayExtenderTest2.php
@@ -7,9 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\display_extender;
-use Drupal\views\Annotation\ViewsDisplayExtender;
-use Drupal\Core\Annotation\Translation;
-
/**
* Defines another display extender test plugin.
*
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
index 8edf006b4355..734e617c1298 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/field/FieldTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\field;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\ResultRow;
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
index 86f821473286..1f66cad87e68 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/filter/FilterTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\filter;
-use Drupal\Component\Annotation\PluginID;
use Drupal\views\Plugin\views\filter\FilterPluginBase;
/**
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
index e1c525ca261c..bf315074e14c 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/join/JoinTest.php
@@ -8,8 +8,6 @@
namespace Drupal\views_test_data\Plugin\views\join;
use Drupal\views\Plugin\views\join\JoinPluginBase;
-use Drupal\Component\Annotation\PluginID;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a join test plugin.
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
index 5e02dd34e117..77a9607284b6 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/query/QueryTest.php
@@ -10,8 +10,6 @@
use Drupal\views\Plugin\views\query\QueryPluginBase;
use Drupal\views\Plugin\views\join\JoinPluginBase;
use Drupal\views\ViewExecutable;
-use Drupal\views\Annotation\ViewsQuery;
-use Drupal\Core\Annotation\Translation;
/**
* Defines a query test plugin.
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
index 8dd4562242fd..e6edd02d4415 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/row/RowTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\row;
-use Drupal\views\Annotation\ViewsRow;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\row\RowPluginBase;
/**
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
index f7f67f0f1a34..740c1562c6a5 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/MappingTest.php
@@ -8,8 +8,6 @@
namespace Drupal\views_test_data\Plugin\views\style;
use Drupal\views\Plugin\views\style\Mapping;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\field\Numeric;
/**
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php
index b6fd43e89bd3..ee791a92846d 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTemplateTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\style\StylePluginBase;
/**
diff --git a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
index 66162dc59bae..02dd245e36f3 100644
--- a/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
+++ b/core/modules/views/tests/modules/views_test_data/lib/Drupal/views_test_data/Plugin/views/style/StyleTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views_test_data\Plugin\views\style;
-use Drupal\views\Annotation\ViewsStyle;
-use Drupal\Core\Annotation\Translation;
use Drupal\views\Plugin\views\style\StylePluginBase;
/**
--
GitLab