diff --git a/core/lib/Drupal/Core/Annotation/Translation.php b/core/lib/Drupal/Core/Annotation/Translation.php
index 9d7f4cdb79c3c65bce41cdebb7f2091c0f13dcc8..96ffa9c5a71e42fdb77d238304e2225bab8d43a9 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 99762322aa35c4d5bccacfe7d4fba17fed538536..1d9a00f434147636ba087b6e8ab2845523cd068c 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 74f25b4612add8334a38a5f2e82444107e4334d2..69aef4a41b48d279c66a110af51aa69eb7a267c7 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 2383b3104dcad228a83a10cdd390fc5c514bed9e..3bee33089865596511f990dcb6c3f28405b0c71c 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 5cd34a629b670d54e1488913a0e596bb6988f9a4..8a5f319d76d81e58eaabfd850a23b8bad1ef9be2 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 2571bb930ee37c3c9423d97567d0ea04b10609e9..df25b6c17afeeffe73fc9a1118c7aa21a27be4d1 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 f85da8d3ace994084938ee8e63d47b0ebf3ff286..2a7d6a9b92dbd5565b51caeddce7d6846ee15cfd 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 9236b22b4b9beb1c994a4221c4fdd02e48b73f3c..e53b3aeb18d8efd226a92b4ce1a17d453b373322 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 16ac5d67dc4305146f715a7e216055f589677c14..3fc1440512d7a3d3fcb147a427a54998ee1613d8 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 5c87f6aa451b09b93357263f39cf44119be49b8e..7acb3dd343e0773177c54e2557a683055f697288 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 629d675a951afc05c5d31ced5f3e98821da2a5b0..8c354572b492df0f6dc28997daebb976f7495b93 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 9e67026ced7408dfffd2d6458192fdbf29235e17..eeedad459380315ed7bc3014e40889c477c7f599 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 4602f69490fd0658ffc0f9d935537f6c53d317f3..f68ffc25691bc48e8163751ed9969a68f25f73e2 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 463e8f0c6ccd74f0b954917337ae6d3a757fdf93..d1ff6a892f953ec88ccadfa18bd799e5c09db350 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 33625ad64622824f572e03ec860330e99c39fd94..4d89e2fa48eb312e769f21b09e43c1749443565a 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 0b5a791df1dd7314cd62beb658e1f455c965e623..510a8693c66dbb5b0717169243dbf50f43738551 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 f3acbd38a69e02d2361536282218a62f6e1dd5be..100f4243ff02d812c5492ae90566e8b2e8a3e3b2 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 3c060b7ec1d43f6b72f400d19b6adac5f6f9e6f8..36696c5023f3c0e9f36b6084ae98696175c255ea 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 c91fcd2e7a9f433d97e6279c9d8b0f76edf4c064..94362dd7ee69fa39e3a6bacd7f03208133ce4888 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 c817e251c8c45ec2c8964dd6b4cd459807a8dbf6..800344b454ba84b8dfde75b5c2a65f9805e9fd22 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 d41fa3c7eaf38ac4edc05cfc16474cfab95704c8..24fd9b64eb033b6a8833c67eb0e15e0b1467aa5b 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 08f9279d2f8673322552e46752ab58a3c53b3795..34b652db900b9d9cd3ed55b74e8107a814e54cfc 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 5eb7f3583c98c818fee3185452d1515bb63c0ecc..c9638ae6fe5a246c99e14426e79c12a941922be9 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 d44ff6bb92d13c218151b7709adf9ebf805917be..77836a70a46ef3380e6f930dd33b26100c20fd03 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 f9bbfa90622be1ea24ae07b79435ac79bf58dd26..f8b34b41fc14972446efa074881da3600975e453 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 41c7feeeb3cc4e81bb582c6f016de31aef696015..1d9ca3c80614b17e776a766baf58322217d09e8a 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 debdc390a9363f48885e9f9f489186e15b9f5017..c35b64fd678a22ca732750fa25eff08f69918e37 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 fef70fdde36163fe51276e468ec85d300f0200f2..a92486181029fd4ca5e2396438e314dc8b5fadf4 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 d68f06e67188ca970790317018b44c6ea337e409..e596f2453666a1e685a2d9747622ec84b5bdc24f 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 9896b4b8f45c719a65f40f81404e2286386c88b7..c2591b9712f5b5d679daaad903d0c1291a33e911 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 01d6d7d7869b33e6605c2e57d36313bbe87f4101..98d08bac7d82c278855862814ecf958eb41bf7f3 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 12829368f7db72babaf67de33c13c86346c6e9a3..f1b2a09cd50b08866abf10a1a809162b1059844b 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 341e92d3f67a2269cea55134a3dcbc80fc61dff7..767639e22932a64db4e7bb750122cc3173711ffb 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 38306d7876f89078f54f94be41f09f0208ff2884..ef253577da5a4cbadf1d181bf49fa050ac5a6454 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 9b2bcb0c46f4d4829c447d5d7eb7bb9b5dad6e6c..5c92487c38424f4e48d23a7e170a580fe555d421 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 85b7217abadc5bbba8ed531cda2b875bf8b92ce7..94a3da5c6359dfc296f1daf39d1a000e0f9bf782 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 9773ebaf93823a7e18759f17bf6296ce399e0d26..b6601c25642cd36f846e0c90e31a079ff5494e35 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 59c135b799cb90fd313a9dc38e06829690438e6c..2fef3bea4bc43b11379cdac88b3728415ecee6e6 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 27b5aa0e667a810a9fca63aa8f098d46f86309d4..1b461540f83f11e717222042f6839cbe6b12c1a1 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 5b755ffec94b9daf86bc71b066fe7e15586f30f2..33803a3777c3d464361153c93bd438a8409af0cd 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 6aaee3ff0cc2a773563c7c9ddff02fec9ffa3edb..b0a6ac8bb7271e1110a4f5e52020016152f8f652 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 42c62bd1654a5fb82f3f27eb2407e1d73b4e8e67..de80cd58d7ef78b0ea4e4f6c85b263ba201b6ab2 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 e12d0984eca5fce45a0f745f31f6d8731f4c86c4..3d5e6588fec89cc834c966587b14a584fb7b8d4a 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 04a5c5ada711a62380e5d182309dd60645ec7768..bbfe0d0efcfa1fd3443a51675220184301397249 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 08624bfd6c4c6b27c4e7daf6a278ff2303e3d79d..4c900daaa6eab813a3438f2de353c90c2cfc39ea 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 c6340c64177853461a12578999acfe00b642ec61..f61fa7b9b7674f37e32f70802851ca05c05e0dde 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 eebc221c8a4c67d41ae67a2456a88bfaea2de512..fe7f461b625e5ec501a486020e717c015f86b25f 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 02b1d766c3559e4438c8ef2cd7862be8231241d0..89dde8d7166a9dedd4bf63dfab58204fde98bde5 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 2f2eaac37db4583421dddfed30a35025d836d5df..657b6353652407a0bccf79a9de525b147f03780f 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 e12b07d1d3f44d8178ff55b1194ee9b881932f8c..85856a36c2ab11b35b77863326faf3fdf82381c9 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 c26780a4040de0e6239e7372d0497d8207eaf4cb..2fa61221bb384e0e42a784e6b1be001d02e1e93f 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 eeeacb0efa2bf9ec1b5c52db17cc872ece7562d2..5d3437aec06c0edc6cfbe7604dc2e43d31e5057a 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 cca67946a2b39608012229c96f7550f31fd3270c..156abf9c4c6d58f246cf6658507754bff65b4b1d 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 4e794f1e3b4e2bee6ef0ad22174f8f46f432eee4..3fd3f6457f799663735286e835e305620487ccf8 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 073613185da39fe601e49346df8e9e1d1ff51e5d..b23f6f613db790d8f6b2723d5e13501c91964c04 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 61c1ea6881eac05757e3c2dbcecc5e63089816cb..f038cb13c052825858d9c66c0928bc35f1fb784e 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 7e95109f24b5f28ce93d39e3b848a2c540c5c003..9fd6ec2e59ab4fab014a598c3701d555858665c4 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 10174b857be283d05e51182299b9a671c0ff4fb7..bdbb7bb18ac4bebba994b8441146e9eb1617f3e1 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 e9e193b9c9bf6deb64722cf6f9bec3b789772901..2e764c1dadf7f10c1304e2eaf0ef7ccb4dc5dd18 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 3f86178d862e7c94a165ec963a48e7d14adee7d6..c5332e1c84e18090b8bf0183e820e4cf1c051fb4 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 47b88c202235063a891c9c178d5c6b127da21581..aa23043d7fb090466a321d6c6a287d99cfb450e0 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 3eefd376b7c1108a038babcdcf182ab2d96ccc6f..03f37e1b36d4d87527e1698f6980951622f85ef4 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 8eccb434aac9e559126a69fc40591c6b368eac6c..5c106af4791b84d5d4617ab6976cea7b85839bf8 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 ca9d45501716bbad435dc98e60d01b817bfe7a3a..29867b1f125ed57706f791f4efb3ae00b5065b7e 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 d73f9109327e8227bc15a98d6fc244a8085726f7..dcb60a802e70cbe114a85fa26fd29eeef8cd7773 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 db6229e0b61b44e3366bd9e4f04d97fe13ad9596..c2ab8c51b11caf6b1b45075388570bf52f214afc 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 ddedfb042be097ba91b4ad3af8055ad8a2a644b3..62c9e56c9a630b5061a099084854e72ecd73f7ad 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 9c11291d8c4a0d178e8e721dd6e4f48301568ad6..cd3ab530064d85e26298cf441e6f3a0e0731c59a 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 6127c8d3ceb07282b3fac095cc3d80053f30ee51..8cb02be64d2d127d71a31c2d96908651d53f4d97 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 f8350cc9d979d959d84d35372a88a14f6d7368ff..876850cb3cd53e43dd3bc4a5ed730fd8623d0ce2 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 29a0b975b66bb0a9c58bf5cd79e76e8b0c2216bf..d15c324617cd31e084b54277d4497606f77fdfdb 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 83ebc377ce260ce1c0bba019b21c5d5b34e975f4..7a627d127caee90b57193b68f41539782f14e20a 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 a852c5884fe717024440a59dfc44db9d19a607a4..7f58b18ef41b9952c9a5da2d9b7e037dc2b3e34e 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 6ca954082fd56223a7ea1c1ed3ab85ecff33c9fd..b74600c24fecac0fb2db52bbe7dcd41193f70249 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 db93d00823ed333ad540561e8edd3b7f25c316c2..a6fe02e238dd62f98575dcd62e9721de13b6587d 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 189159dcddc36924ea460f4842707561167c9a6f..c3ddd0502e12819a2789a46d052676e0e38c7cc9 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 5ba79da0293e8f2ca29082a007a529a8b8dcc45c..8f8021c85bc089e19b4bb72e4d706f4b40475d01 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 36a79c97ae87691a2120ba55d5bcd834c885ac83..502566f58ebfc474f8edd951f79f825c5c30e144 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 6344b9e13942005244dfd32423c2100f45334b2b..2caeffc58a72bbd5c68c224e684eceddc6c1733b 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 94ff815fcc405cbb2053a334a428cd7609767958..eed6baed437c27a2a0afa11709576a7cabd7e33f 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 6e78e769442f8887e50a3e07ae9610cbf4364a23..258b3294d735701982b2f95b7472507406a023c6 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 f71e76fe94cc615d425d9ede7414359e1ae028d3..b9fd19e64b9829b78d1007af7e4f9144c378d6bd 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 41d6a4f8314fc2300b906e7a4cfa0a290ee39160..7d152795d4ad00202a996a4e98da7e267b298e35 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 270136e0070ffd0fa159dc09a4ec32b7cff470c8..ceb187a05438903fe5c363b8ccc0afbeafb31409 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 69ba9454046acd774c0aaccb81f75f46f896f365..3313fd746dce5744f0ae5dbc7c3f6df9f7eb3fd9 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 5cced6a26ee1b99203157737d8e3e04d7a45b242..dabfa7965194a45e226ff8de05d73d55b9479cfc 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 9d63403a0c90acf9bd0940e117f4f0a596975518..85344f6648b988619a5623e5c0e501a8995b5513 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 d9ec7a9c5fc8c9b2449eba716c8bd1cf82c059e8..1f3e3cacb27af68da986cd2608025caf51c4ae32 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 4e263db29c44d4aa7c74efc40a0c83674f97df0b..4682c9305d28104bd38dac24cb7f3f8688726ac3 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 a2713dff46c1965b29724388b5cc6a624bac50c1..56ad35228dc82ab948e7fa96d15dad5650dbf721 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 ef955c03383faddfe355e519a740193010bd52fd..49113738e4d46da3efa2870270268d7ba9114c94 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 2f5108a876a12d88439af99e1c6d90a8c85c452f..9d5c7ce283b98d688601bd51fa5636764f1a4bcb 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 233cdb6b69d7a68f7cb5e2a72474909b8cd6eac2..4d5fd3497fd0d9a10f452a72cddfd9b28c5bd8a0 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 e030f8d2b3a6071f1dec3c4e031f871bc75e7339..f0d99b27967e21a04e6457f02b3cf17a7816a10b 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 1be525ad4b5a56d4c35a6fd227d7b429a9a821bf..e63ae1558680ddc0bfc41fe4c17d230521b03306 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 a4c7e8c70076147f2cfaba52cae24b74dff36765..c781d222b8f724bca13627db9f31e76232464393 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 3df6365595c92983a2c71d8235aa4bb83df417f6..34217a9d4e20d63fac83da212277a0ba96879f98 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 488f2e71f81bd922f51f802625be77903de43650..2c2166acab596b3f10ab6da386219681945de486 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 733d7ab28bbf00941783628301b01e014c0469c4..2bf910e5b81cfbb209952f79a705ecaea0cf2eca 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 3a14cb14f54749a0b47b70eddfbd7c3c9d0c2692..7a40df1c544540254347eea0378c2cb9a596fca1 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 c82b457e555706b7dfe32cead1fe59ce339f9c15..10a528ed4c1fce115b44cf25113f972ebe72738a 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 afb2aef5add5105cf4c72f9c97d921f7ad1cd08c..4868fd894bc68658a5a7fa225d7078266460afb9 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 d8d427822f2c9275c17a841a6681634ec0651b2b..c3d3947cb5ca5144087404ac046007747c20a891 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 98c9c1a38a5fb190786e0b27cd986ecf3e8d7a7a..1f969a693b69e6b79f76cae14e4dfb7645a52f92 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 4f294d10a32d4c4220e46755f55b09f75f521f55..c17e30409d5ac5cda2114f4b647316f569618fee 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 e4f96ed26251bedac6216da3879d62ae49fec6a2..b286d66f5a25b361a76e619bac5d46a2659a8b19 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 f6f1c6c586c1faf4cb4969ce2c3e42388a46609f..27346c92e07bbe1ce8275aa17298ef0438924f9e 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 55b0549b91bd92d6ec9d040a3d648b556746d2c5..2138b578b8e03bf08c1d67e5659db036449874f0 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 ef7e4a2c5c4c109a4e1ac021297b42e57566f2f0..8944cee61037f5ae0c2b8921cbf769c589c0814d 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 8e2284bc2992a0be3ce6c7c4dece54ce8bb3b2c4..6275fe516b6a2b6bd1f9ddd8fee66a4ff3e8bab6 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 1d17d5e79a0ccbfee66c97551a9cad6bdb7143a2..1b569a8f287402fa927738c1ba0a6de84d86a6a8 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 fb0beb7f2926a4be18172dac66a2dafe722be033..abecaa3f278761b0cb4951db53de623393aee133 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 496b5ea1ad15c40e171d176e27ca2d95b3b2598b..98db6900edfd3f4ad4829c685ec4e4f65b2e7e74 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 6389617763705e98c4bb7dfe97035f64b8b60531..7ee45e630ca8421c3f61091caee56ed225efd680 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 c72404c24a0ce6ebfa78d9c768735f838c6cd61b..03fdf24f163442dd23dd4edcfa193f32b32cbcb0 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 75b7252edc09353deec1838e596ad42ab42f2976..d29319d6f84bd70923ecff21a5e56ee3dc859750 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 83e24d9e32c2d8004fd838fca41618471892e27b..cc43140b37424fa74d5d4d57351484a274084e5d 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 2b1d57c0864bc9edfddddb08764b37fdf0e1105f..260925651c0e3e3523fb28bab4b12d3aad20b46b 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 e7b1cb3b02000a7daa17f1b351c532dad28c555a..d3597fd95a65a6e2f59630ef0b65bd05005a73c0 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 1c1c4e5ef44277436909dc8bde6e75df3c8e470d..18e6bf4ca936496ad738df77c211254614fbb4ca 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 f6661cddbcdcb5c042e2ad2eb600ff75b0bf894d..61d7b20ab05fc68df384a9b6a15f46402148631f 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 ede77992dafec1d18110917d088ae98282078759..ce414ef9660b78a6a22a65999307aa1b46367c91 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 5f68857278e539b244eefd6a15d92884c12bc219..a88207eea0fd4ee0d398de3fcab655df8590f124 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 87922a40b3faad4d5ddad1910c1be06f6f6cab76..5b642c84df9349aefd37de5fbaa925b27813709e 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 10a1de006f906c382a82584e5702bc01f4bcc6cf..96fa5ab47df8c0858b646c7f6727048a773732f4 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 add942f4346ea8b244ebbdcc096926595c1ef310..a9ef14c9b4fbc5d4b19b23bd341a84c6c72c2f5c 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 3f28bd84c8647701a64423ea22d69526d0f6af23..8381a1f184d6c34a24c55099878ea3dcb15912d6 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 8c6ab7ed5c5f8b01831e3fe7c32bda3a1fb9fba6..08adfac13b656800b9affc37f9dda6c3a6d453a6 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 4e17445cbf9db98d3bc7a0829708ad6296db10a7..3a547168f7ee9f1858888909397763db084910dd 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 119126528fba897b5ce69ff9f7cd3741cf95afec..c503e5eca4d6a1f88baa7b51ea66088c0590c9e7 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 3da51b37ff4b3daa7cce842d95287b1df4bb4bcf..c3d0be2b272cf7893b9acb75d82715258230f6a3 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 10edac43113c5450bdafc7a5e0c180484d780389..6cdf557dc330c4a3528afbdce359e827e4c1a50b 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 95715840d93c47c8448b572e3fdc736874acdce6..715820b53beef2131c48ba2cf61a7d6ecf7d7910 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 23b3b844cf193cc98d3f02a29520f788e3eb7062..f842896b7f42312a3e66e9e2c0f3e9710de8884f 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 630e6533e60bc9d90dd2cb0c5e49eb45f6583cff..67cede41362571af8d16d18e748e66d477e8ac40 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 c776fc4e86e7972a5e39336955257e2f6fc35f4a..d3552a8e7ed7fe8c0dda61a091ec01d62cf9fabe 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 04c312a4153609db54de0d70f9094c9b6948f4d3..62c94017b0ac6434a38c7d3ccead367318633176 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 3f6b8e375b50703dbd359eada75dee0cd84d375a..7f830264f7d3f27c7b932bd782e1ca8ae1915057 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 24e3114d27a4be439d4aa1e636c53aa7598a33e7..549bcaa320afe6aa053e2234874efc51cab9fac8 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 e919939067ed249069453f25dd78f7eda254a0f3..ba5fb260a795b73799060e7919afae368a548ed4 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 b48ab2364d9e12c58111340ba10fad51d220d36b..a46689306ef454ac55885cb623e19889a30c0561 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 4b432b6ff64d1e04cbc7f13782b693fb2979b40b..f7e20757a55a004cff8632831c0c68e22f26a0cb 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 ab1f07fa51d6ad5e39d706c60a8169aa7cf58398..f360050b0cb8e1a13cd5418df9b375ba0556e390 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 86f4452b3e90b202c0c58eb9f7bb37e3f3a24e10..6c94dbf6fee719d14e16811eb508cbad206a664a 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 7c3140dfbfead5c47fd6de3f288413d0e783d1c0..ad2a30e40e07493f24733696dfcc8acc227b9812 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 3c7aa2a60b6ee5109f8cd74d92aaac9e756c1d89..d83f73635abd24e9d721decf997f3188ce829543 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 43c044273304246eb31c84eaca888de8656ce5ad..8b75a837edc290df9c34476ae75f438d50801743 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 2efd1cb6fae85c48b09aa5a908634208897a6f47..8b0f502ce57cae24376931492c8d337ae08ece4b 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 1a1c108db9694c8dc9c079e042e585f90e4dabd3..6b6b0dbdbe026fa050d42c56d7eb6d04f7aee26f 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 d25d5cd4def83a7fd76de8bbbc5ab67b6bc3b7b3..aee3ffcdfca6ffc70a7a596e8bb1e713c83ccce5 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 39f58f325891e82240dc528a8ef906eb5c5f9acc..7996d04e51cc903daa2345aa62d0dc325d3bf691 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 912bec9d688c2a740153491efffeeae66d6680aa..4d899c666cc84b2bb5c91867afdeae1dc38a7c66 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 27d5538c64a9d5a9ecb70b0032b9b0a4aea7ed84..da9b17632b4c7ec1fde441708a7c5d88dc85233b 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 571c5fa3f5357af874ccb941a3217162d98d8feb..b0e6bf33f26ae796b67256af6cefbdc982f5b980 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 39bd2ec0bf6622873942f44abf52e59fddabe97a..7fed9b19468a9a4951bd977328488fef2f7ef299 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 1dae00819fd1d7c94ea61fb5b89cee1ffe0fb029..4316bd09ccbe2705910ada2f6ca24ebeee42b9fd 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 52731fee4eb64e2564b2db3b676b910947c940f9..8fd8632338b67c22d595a38049218fc513cc1f78 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 8580d87eedeb504ac27e886c2265ce888c0fe175..6ae43852b8b9c8dc79e411ba455394741d3854a9 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 4f285c95120f3d92f35b8cf291080e6c98c9f7c4..f53c81b072adc0030723c42ed93ba305a5fcefca 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 7cc31db03147770970f83c69a519bfbb64d0e1c9..7f4289ea524a8def64047572319d869165b4c717 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 34355861e3114d8506670d462c99a96478319862..a2e0074b40dd5aed0f859ed7e6d51cc4b1b4363b 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 671efd0ba84c6a4be0cfd803400e611af2f9de78..4b57b9b7e8293170d88ef252e6d3aad4e99e8a65 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 3bf59c962be0c19dfa8dcd14a824435278c1061b..6d9aafe54309d49d8c741d5a08bd11f5dad7fedf 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 b06c583e751fd85ad62f284df4348190bd36daa9..33105d906def28dee7e6b8b340f53f0774ecd50b 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 50b6c7697a077ec4c82ec2297ddab70bda19e25a..2de926c6e4bd507b845803cd24b8d42378c858ee 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 47a45f9aabcae08517ec5aad6cfdf6cdd2a08d41..603f0972b8e69d5de665c5b2b69343293d6106cc 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 8adbdb1c5f81f7469ee60038c6120469302d062c..e490ecb49691dca1151083bb0b1614080cbb7122 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 0b87b382bcc488dfcb270411687e2c2fdadcb314..0cfc31636a472c38ecb4f31fcd4f830239cc237c 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 132e04503ad7447d95aa4c64bebac6b76b71aa1a..20da55ef51c2d7cae90419b5baf6c47016002529 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 d374afca531e4c204a8f08bac1c2099e25a923ac..b758b72f50ecacfe6f6d16c0a25dbed0ed73b3ba 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 a1700670758bcf29e641d426b71f661d0d1e0109..c4613cef8ed4d0fcfc522627d4a4f9d1cfad003c 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 d227c303a864f91bf0306249581ef30b42f7d055..953b0f427edde3f07d8c9b3b0d234be375bd7fd5 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 968404f9a486b2164d7ac64dab4b907d4a923022..d462d6de7e1bd8eb4816afed3f90d3d5ac72c7da 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 ea93058559879be0873363749a1cb46f155a9ece..204b9d560cbefa59819e4e7144fb5660f286fd97 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 d5db3651040ed07c894fa3b4ea71fd1ce3a99965..6898961c9b3e3a69424d3cd4c759fbeecc3f23a2 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 7bef9bdf7719afbb5440e179529ea0ca28fc6d2c..ebcacf68e2ab8f51f5e3e3c17115391a742b2cb0 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 59ce54468b60360f0a07ee0ba3256bed50447a56..373920936c94b081efb84f067aaafc179c781c94 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 143881fef37278598891424a895c38ece7cba628..f8d3d29fbfc5be508d2a955910970e6dc1635d53 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 5a087a884397e4d6003306326efa1279da7aa20f..dbbda10e2341563ea5108cafa41e13880f29a0c0 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 666cf2617fb02cd41ebd26a0eeb2bd6073b1c6c8..5941176ac064422b44877e94306772aa18e4e0b1 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 ca7aa8c5720197b74b3687a7635429dba7ef0871..e7f0e1d1b5746231be0fac7c88f91e96031b6b01 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 d06040a52404b64a43e4591d923ad1d6034173d1..cc88b9faed1880a091d7d85ca346d7bcb45e0a4d 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 048e1f7b10ac768a6996112b94639ff3d81c7630..2b4bffd7e89d12d0e0ca5bd421e1c730bd865b9a 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 225982eae49d8cbb6f1b23834ec1a2f867b0145f..4f117f6aa35145f66221794fc1197f6f370e6bc1 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 32a7649f8d0a38bc9b01721ccb498e501e4e73f5..9845450f24a9f058339aeb6d3b625b36bf058668 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 781f75eff830619b412897638efe5938c990d6c0..fdb3415aa65e60506f09849d75e4c181c3d1e7c3 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 1b7be8eb68738cd728303efa51cbaff3ac2ad9c0..3e9d8ae6b61fdeede148e6b4a462e93567d5a651 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 fb8b72a913027f5f8c1f46f48acfb0695fbf9a04..9d06cc39996d4a405f1158350cc0eeba736825e1 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 eec172abaa6023e06d295bbc9c63647f00d9d630..36dde027ccdccbdef52b9a5483da492f18606b57 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 24dbdef770e31728b8b0c4f7e1a72964767f9a29..5f4aee8fbd9bfe51421ce1eddad22f6036135de6 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 b2de15a2c64ce5d2e9e9aa4fef581d1602bc0224..d0c766343d983565304236df87445feb64c9f3f9 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 1fcd4cddd3c03ea7f3e8f33743d6f0e358714a70..35d67205d7eaaa13c61b9e501319ae4c6ea2381b 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 4c0c6c8f5b6fed2232f2fc55de8384c507700bec..26520b81a5edb3446d60b36f5e1f236847161d54 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 f99f6b7356c1dc26b53a0a406da72c3f72a97e41..2f976afa3b1857978a22043bb30aede14d5f0869 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 6a733f3a789f2a70a4457d4f49e86f4096c23991..71bb22905e014cfab0e9ad0d89343d0076bc3e8f 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 0f8cc641e7b6223ec933fa705e95d39fdff8cfb0..899aa83887ac7c67317e662ec14c22b4ea0ba86c 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 13c10fd4cf46c7ba95289c9ed7335d25c6eceb55..d45e476efa9c339c59dd6170cb8eef462328b347 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 1f463010d65efc91e5725618696a64ed90705d77..ec46faedd08c469c00ff53dce0b5d1fa553ff757 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 b5bf7739350c5030aa04881b419b9471eaea629e..09e7c7321b9b7eed6858b0cfbfc22dc81bce1126 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 b73de2918024b748d1646641833688aa14a48344..cd6c385123500ec5f786f71c396edab84c9840ab 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 b0ceabf03e0069dc786ba485600116ff8dc8a531..ebfee5cc8637141c5ee472901c73181aeb5a5430 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 4f7cac44ab4377dc3e5006644fb2eae3776a350b..979d222bf235f7273c0317bbaa242e4d511e535d 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 fe796ce871b7375d55ff21a1d21811cdafad11e9..759b9938cd9c1ef27ed68450acd1d13a0cbb8e83 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 13465990f1d59280768cb86caab48aadd4469799..d4c31cba05a80e217a2625a7763722d54c8cc094 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 214acc1c4e34a3467495490badb646769bb3b09d..26a73acfdc3cfd96d0f33414b67e7b74c514de50 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 3b409dd3606859d2eb8b2eb3adb5156b326d1e21..cdb70c5a1d4a3f0541d6650f4e2b683399d44961 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 d6219f994c491c7be3bc662fedab5c36ae47d901..8b7cb990ca4369bbd0533e4616ff50b948f79eb2 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 2d2f3535dbc9b518f2e0a68e4113b0c356635b90..ae90d745ee07d343fc69dc6be584944b6e1b36f4 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 cef895377f02c1934ce12e4e98d416a638635502..09111bf256944b094a2fd4ca5272019237665d56 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 80da152410d7144cf1dbd6e94f27e3df08604bdd..1d96d2b3056e821081b87fcd54e04faa4b553765 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 73291ca77d9de3f52a6d1fdf8cb97492fe25e5c5..771aef1fbacd71d129ed4ec0e4e4300095384376 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 605006ad05717a7b4c3bfb35c9b66eac0b90037c..2e7ac89f82aca9d52d6cb843787b8fc97cfcbecc 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 70a97defb0cfdcf2fa062ef09f9d72e38d0a8818..f2dc58b31ba90dd5a3835640ab9cc62f2c9502e1 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 e6646d16cd960036605229e883d20bf60720b5d9..0fad572d188c08ffa9ea742950b9f3f4b5f2cd83 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 ffef447a995009a7110d65261df18f8524e184da..708595e76c3155e1e4b4bd8d22ed16b97f205c72 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 da2f8655b3a73eb0fd59abd23e8ca14d0be247e0..ba388cb22b193a0315647c6c9a438bf6434ea74e 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 f3737bc302628ebebecdd77bdcc32890ba33015e..589d499a8f00f1963d9d679f2f0ce3796f090d7c 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 2ea35eb1ebfe1ab00558cf9d02ec808d31b9146d..e30b10e31d3734359c78db8b61c19b2508f029b6 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 4a5efe2cb2681bec3c62b07e595ddf7fc902060f..cb64ec0f6a5dc2635fd57b79c9b12910d3f1dacd 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 659d755153e068469956669384be6d4f2a17141a..64f71c4de874a6b13f04728a4493bc0cfffb033e 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 4962a92d97d864b60b50a2b181d593d63495e4c8..a313158cb02363b935bdb14f0412394eb5ce9f31 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 447f800f797c218f6f24403b53569dbe7f6eb500..5b052523c63d28e9d07ae60dba58c790fcd40fed 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 5f6d0756f893ddc831339985bd2f138f5e076188..fa5d7fda54d7c44e2287dc514a61efcf6b9931ce 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 b6510e351d7c427ee9f08c91d911b2ac86019959..0453f169f9d0e033949bb890685c334d457ae8cf 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 299774c5df42ee7cb2067fff09b1825fd2e3ee0f..5865653b28ef115ed9b7d5b3dc1aabbdefba62b3 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 ec239a61c16c0f4a36f50395eb6ca3306b2bb869..814fce5f530a3c1b43b8df00068eb1f7e44e61c6 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 f7b389d91f09273bd51f32f47ca17005a2e57d28..f669e6158d4a18b97064938de29f6d11424225c6 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 26d17f7fe5706a2a6d2c3dfa86d4c17e11c758e3..a64951ae54b30647ef5e707f82fc7359977a2a8d 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 02976add9b1849ff2834134388279ad5363b58d0..65a194df99033798520e43bea11fe08d7b02622e 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 30a6be22532303526015d0e762f5bc1ae1cefe3c..742af7b607f0e467345d31a7e9d2fa9315758a31 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 41484521ca33efc7184e2bb3c57d6c6194497cf5..7f18b572529fc24cf04279ed56819bd50a267e7b 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 71a42e47983f9a3b57a61338358d7273ee526886..e3d296f5eb1282de733598a88bc921f9119ecbc8 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 7a81687f088126470e03aafa6faf33883d80ea4f..8b33daf7ec50442020c547f391bd9f3476932bf4 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 836eafb889ba92652e16beb5a50254e232bf9ee5..6ca66a437031207d37f3074df2b7e0bc7f7ea72f 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 642439a0b06247974e6f5ee072ce4cf976bad48e..460b2e7b4ec8871def79268a57d5c56effb7f098 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 084f062b8394e617e511ade38d7eb959c400bd65..d5f22cc6bb09addb185bdeb7ae8dec3c6eea50eb 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 e09743e8b003b9d59b11ed347fd8c78914120524..b022a1752648e61649b57769769f310985a0d3e7 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 b99ff7162587ec75ce1e40ac630e8b7d9e80ba5c..aa96db3ca8def1f4c8dde709ab8d0b412c721ab6 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 f80caa0eb610b89bb9aa105a6aa97c014e2eac60..adfef6e215ea02dafb51a65bda90d7acfac9ff55 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 7b6db36eb3a1081fc49879e68e8c18469916a0de..e0dce68f1a367bdb77b47c7b047a87c9388302ec 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 63db9d6bdf8afd2545b7650cd37071f920c2bfd3..ce97a1ecfd4d48add9d285e8f1e4e49fd970fcd9 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 2518b42c8555a9d64153539b967c6a7eddce5318..a31dcdc127a8476bd17ee7627288f7f0eb90b72b 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 ebe88186bec678f7b93123d8a795867fc84a04e9..ee5d594997f1ba307885d8349d14af7e87cbffbb 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 b3be67cd1e6b78fbbfc29424970cbab2371db966..6811143e15bec675c81e68230ce80bc023cf7820 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 f15fb3a628a934bc3e50faa2f9627eafd64c7004..e424c2d727de4c33e21196eb332dc98e81713d9f 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 269f3edb46a256dd100f3f0986cd563547183e82..d0904c492bcc0fb6476b883fb043414ed1b550f4 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 1d668f7adb9a65ea843ae9d4a14d26048f0eb513..1a7fd64bff06f73ed0a5c441f949c3c6a9ce934a 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 fd3fb2f92eede3dcbd3e12c245eea13cc62dde89..9aabeca1705b95b71de4479d26783f880daee689 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 55f1d12e99dfb53c67d22039c921f98e1a29d9b5..4801da5ba1080ffab851720e1082f340fc0a3ed1 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 1352983dccbf171ae6d268a50a2fd1af824113b9..d22b90a98dae4750e1da16c9309075fc37111807 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 02b8a36d01c98edcea6e2bee33939b7f9709327a..27d7d00aff6e2598f8d9330f16878857fed9c767 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 4fa499e6e2f61568fb35fb5cc0c316c47aa606ab..bf85ab866769199e7024e0ef6c837f13265a91bc 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 b97e8926866790364fb66fdf5a5541c44e6000b5..12facd4c788eb5a578154a096547d13fac0fcbaf 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 e7205dd4e9c855446886cb395361d6c6cd3ad4b1..7894242fc5218ca7443e530d64c5f53f9f87525c 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 4cfd25ad20d80aa39072e42ec1974cad1f31cb9d..abe16ead1e30e4cdf3bc75165a89bd7ed2d94372 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 a732cf362ed835012c88034e89390ac405be06c2..84c9415e76abc73e089a9fcc50c2fbab8efdf219 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 db159d73e1ba3fc97ccfc026f1fcd0b386d3ba8a..5de76edfeb9e7c33f8ac0e8beedacf90df94231a 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 5ff4aafc97a5b6d7b71f9a4dc463118dbeef118d..d1f75c6c33f5892ef4312f5a32e28b608df507af 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 618ddfdc54277904a7cef17424427adc63f41766..aa9a5825474ca37e6a795c57e0a2292a408ad283 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 2eb6577c7fd12c2a233f1603aa7ce0555a41dd13..57ad4285d229321e99680c26c91ded54aa798555 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 b2d4e33d91c0a9473204fb9f2f9e864d7d0d4b0f..220353701f2a60386cd54a6ecf27d5cb193d404f 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 54b5ad58775a743e87768dd9c4ebcaf76c02f07b..b08a93f620ab37c2c0034220f878adb0dd8a6ac9 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 be01032bc2b4b87cba3eb49649bb77c5324de39b..1c5b79c50e6db49101ec328d5fa2d276f1920811 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 8cbb9fbbe09860dbf80c78dbc35254c07f7362b5..bb6d43bc7071e72fde7a630e2583d62c5c0c2005 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 f4219046d05b7b7ccb1c8a3fb8a0dd633446f665..ec4b127dd570d51458a0566ad2df897d31112e90 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 3bae73d1723e687f68291c7a07e78fada9181c43..5aa1cc026add49708ecf23d8fcaf884ab20ae7f6 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 e46e18e1d1e0ef8917e54dfe805f5ba4d84f2cbc..91fa52f9ab92e5a9e815309310704e6c6c4db265 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 a8f7fd2f5be705876bb25d72139cd17cbcf002e6..fa4bfa1dbe7eead8f8836d6cfdae8af7a6410c3a 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 35a33b2318db5e3c09723226d9b36d3ff7c6596d..8cefe1649dab0693dd683369f11d6de15c2afb97 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 5ae155845b178acac714cf595288215dbbb0c69c..d8834906aa479cb9a1915373804fc2b6b0e375ef 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 7da574fff7144527a79876465d97159aa52a70e2..79ed03cf7b9868fa55ee08be769c0cecc95cbfe2 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 1df6f947796e0c1bad45c1816594dafe0431c44b..05c779ae7d3a7045765ed40c2f7e036df13a6c96 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 792346e75b3926d86e060548dbab9688ebcc7177..2fee1bf9c28ec5479b03a0ec4c4fd3b9029a9d51 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 7757c2301fc75a462656a969d17f1660575de833..acf4dd99425c25f256fb2caab400dd0f8d3464f7 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 4527e7237a648a268cd76ba13ebd972f3300f621..a488f312436410137e1507bae4568ba9f21b3115 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 009cb5bb7564f67de0596d79bbc27e33c175e4e5..b404ba0a32a9da423062235cd11264c38bb4e4f5 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 80c1aa3511881c18a08e5c1e5461583a7adddee1..e63a70a936ec433eefe40ea8b830cf555ffe7c33 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 43ddca9c603c55811767e9e21be8ed316df62cfd..9c30ebcd83f65771c8a8893638a443d17c25884d 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 30b83c8c46c8839e7eb7e222138a3f5aac44e5e1..b6af908bd24370e3f96002a74b83cc35246fe26d 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 75399f88b72ce851ea52d7a4f4452347aee8477d..ea5f41798f0a81f70571441279fe5db9759fb8fe 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 652abaaee7e557f707cb1d64702b19a5c2351cfe..e3b8b0ba9e0e13fb3acf55fdbf7181cd6d618612 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 a70908758e0d3162374c055f15260abd89e54633..8aba0cf15c1e4d8c593218d189d5127dc68174db 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 72bfcb8bb8bbc7da3ddd9f560c6503bfeedd4971..d05d5a64d386a7f38cf92d9c53bb49bddadcc67f 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 2aeee7800c5411d0c647bbcee95920b096eb6f22..f14bc4e72fc6324a662532629cbc385822c71329 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 3c75fed61bab6d3d13af569a4c70ebfbbe05e10d..5dcc43dc587c3cda4b47716620b00ead2f51fd97 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 1c4fecc4a60be0c85e1a5c44af96aedeedb66f60..aa4f1ce93fef9c9a553750964ecc8c00c8f61790 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 8c971088c1cdb916e6c768730f079bd5f9a33ec1..743d6cd05c24afb61668b008a09ad8cbfab5778c 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 024f40d0063ff09fd49e23eb58f7ccf3341a614d..e763bae2cbd4d5919d973be7a7897fcf553a804b 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 6596dad2fed0b5822c48a60620bbd25c60c4bb4c..d3852368f27376f34c5e18c826fa5bef35819fb2 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 46c758006b4b1f365b6d2a384f1fae9839171825..6a9af10a4c6f7a2ca2347bfa07a7fd76e0c2a5d2 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 88102b88fefcf378110fa5990e7cf0c5c9b285e1..2d3954243d2aace1c8552846f6c89cc6ce5c7d97 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 2449acb8b3f995057516420b1799635f0dace32a..5d21ccfa83d690e0c4170e39d24164ef1db46c43 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 d58c7673637e7e5f533658d8e82e4735b9a4ee11..6442691e813f2399ed8c2ee58f1e85df5a035860 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 1520359e87728333fbc210b4bd653c62117dceb9..102169dd74edaac93f7b2a7a250cfc261d9dbc8a 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 fb374ba3347267a57b529f36c1f6dd331a66e7d8..2ce056b16ef635693d230a3a684703fa04446a97 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 2c0529b1dc4a140ae7f25021d046b2877a3d8d20..dc55c92203a3d5bc00b39c96de6c2799268c8f69 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 22c2819d1304090586f3a81e6cbcae0f5bba79e6..ec9df998759fe21812724ba2b68db3644849d41d 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 159b4aa1d8558068066bb51e703f4bb70922894d..7077685e3997a3ed96257c4d274e4d44824a7f32 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 ea6d67a2fd89fb8156601c4ade4493af672f3a6d..b548cd5c87649a9b474621d7d192c8a113a45b8b 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 d88fb8b8369556fa56b4c27b9e23df7727181797..05c762f8cade0966b2ff01d3cdf8af5eac1b6b56 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 ce9d26ef2069a2ebbd4260e12bdcc253334f6e8f..edade48dc2d195b9825ecc356bb07d7534d4dc8d 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 d033e724fdd09cf60b584b45b0152236c91362f3..b9a7320707ec7bc89f1a8aab0065321657451a8d 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 6d763fa01029f52f9f79b5c30bae0f66857104a7..7a8d340fd84d20d69c4ee97dc9927325d1fa59da 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 ffc22f96f85f85bfcdeac87d8c59c36768d1d16b..0a2e0662de2ed6eff2e3c90a9f9e548723408ebd 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 1694c32f47a01b247ab4ec2c2053633ff7157c92..36de93d4947f2f6c48545c6745a2482cd344c292 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 dac57a0c0107ee0d1e0b0478586eb4bc0cc34ecc..4d521a9c9b3ad6d5227e100e7ca79d737466b221 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 8c25e9f85ab8a042244a871e894ff8d6a0fce898..4796f692e682514a5ac0308a7047f0e1a3c08b36 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 0b5d037f3d1ecd4e2cd8dc15b1e3ca074d48b1bc..3cc2d36ed2eb84d51e61a6de76db352ec5475d19 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 1250ea3d10bf155c85943babadf1a9a03df40c47..9e82624d1b6323d0bcd3d56a31483b9262dc8f98 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 ef1cd2160ee2dcbab1760cdd0b2fb1cc3f002f64..3bf75efba0ef10ac24cf5bc5cccb64d332d22c5c 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 c06a149c33e793843bee5c54a81c6823ee5098f4..d7b6df40f2e88fc8f58343f768f385252559aa0e 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 07c9ff5894bffc01ea71fc5ef81e3f2ba2b30bb2..a7a61ff8e3b8ab861ab6737e1cd331ddbefd09cd 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 b29c58941366750b1793734579dc3ed870d7b74c..3403549d42843e93bb05ba5f7538b693938279a2 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 cd8dd5e759cc9be9a8b794efb07579c3ebd718c0..558cb1a1663661cfbb440b50344140062849d327 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 63802b5989c4b615c46b38627383f471aaabbfef..5a21b923279b4d81fd2f390ede1fbab9a27ecf56 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 2283c4cac84e9872a121c0202e8bdfa22a5ec9fe..036e2e673ebdef730f458788ead5d9fa7010d2fe 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 c3f168b28f897f7b325ee9d8b371309615ec5c69..8d935e0986d061f60c0895247b60623ee5ecf251 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 96140db1742d77ef65d4715e6b62e4e8d7683b2d..21d34bd8250dc05660ecb4cf1c8eaa8ceb2cb527 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 b9b419556d77b3203137dd9c402c66bc51ae50f2..607ec1d8f1a818bb6f5ec3e222def005ea9247f4 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 3e07049144862a04c63130a807c170942901ab66..88266d15b183c024299e2d0655779f7107f56a7f 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 29fa35b19c58991be5902d9408768a155b190875..efddb962a90b3c7dd59a8920456004241f9aed3e 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 884b390565e65f812f5408adf3b830b5aa27acd6..184271e9f262e95feb40280806ee8184c4295df7 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 56f8cb60021ec9ef8590b85134c8001ebf26318a..76bf192fec2b1a9e94ece6ca01eb07112d645e1d 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 ed2b20b587cf84b13f5b18bf6b3dbfde25f3aefa..4dcb180dc320cce0ceea291af3a3f32f5a433554 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 0b2f60dc6178c1a09049805cbdf6a70c54088ca9..43369937c813a7378968a78de431b80235562cf3 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 2acea7fa3e8c1c4e38eaf0b3cdfea259ae406cae..b53ba930589422017e9b053666f29de697b1d4ee 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 a1f2a46a61ba19c68c8cf8cbb26d0d6f30c79dd1..ff7e5a3ef442478f7280f03c32c172ed6a1d18c3 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 11e5d0c8d10fc228c852a735b7da2059b6dfe620..ed0256b717ae3e8b40a3f3c3a90b4bac5cd15850 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 05dcefc3963e8808fc5f2107ad4710030e171725..009a178718b22d4c4f561ea1761a611585824a88 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 8f581117ccbd19b15346866a3b97daadca6891b2..bd62f351700de96f94beac1240d8a643c11c73a5 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 cc9ad745e71c91c0e63d93bc8788e68d5bf3a128..c4a49f53e207dde3a18ff5100b2f48f1d45d88a2 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 6b970a45ddbfa26907b62e5837e0825b74b9f659..c1cd149ef53936d958c6a84b677c6b821dd87430 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 cba3810736094268ef2e4f09481e7eaa57cc75b5..7915204e8ad3ed0d7bdf06506a315b6cc5fe46e8 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 3c247d80035871ac249c7fdfe8770f956f725956..8075c27ff6ed8cb324b2b22ec1339d3ce0cd9b6c 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 7c61ad98cc8fe94b45ad4aa090f7612171294b8c..234a0a061af58a3c5f59eaecc0f261477c0e366e 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 de7dc8be8a3dffa058d28f258be799272de883d0..26c59f746ffe7dffba68fcfc5621e8e4e587dc57 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 f636c51f98fb4919fee17c6772d5a15402f7516b..8de9d357f315e8949d1aac7c856363ab1d80baa4 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 158d0c5fcd8281018e8b31fa08fd60dae0d069a5..5508f3ada531635399c4d66c712adef1090c3e5e 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 a6eef9054779f05072b9da84c422497edbf9e925..8932037a95a8ea23851398b04335ca495d59a14c 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 2f94593e927422bb53df362828c2c2883923abcd..c0676a314346f7d19898f00a98d91c0aa42495fa 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 f44871021a12d18bc28e763648b97e16b4a526b5..062927f447c8c25f903287d99086effff8d09576 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 daef3617c45f19d626635fe2060e96a8a55fecec..365a8d8b7860f92246378826a004e761f62729c8 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 7a779d3eabed1bd90447323af9c51ee531774015..94a11e8f31041e77ecd776076aa055d627af53ed 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 2ef89a82a5a59cdf035bbd39c75462fb49566a34..7ae6005f5bf55b69df408205b86f470746385a65 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 ab736b6d14b2fd8d11c603946fd9d588b6c864d6..c35c06d4850b6509f2747ca32cc0ffd140739c33 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 bc37f335e54d858956f6d2592a01e7d0dbb01480..7ac209b3e55ba004986c5738c61507297c44b07e 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 98efde47522033f8cdd722ed3ed24c1da98505d8..ba38c2a1907b9b7b37bdcf6b8c95c283691b1755 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 7acd40b2c0421ab4c60af38fafe091e1c48851a1..8117e7ab0cac993c28c17e60ef22777e77c3b167 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 8145321fe137d535a8ae5bee5170174452e51c79..020495297fa41dd85367db9e05ec6c3e64f20c6f 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 11a4a23e25e438e588ac5720b1cad43f2dfc8640..83bc70741d787023f04a5bc3c9c50458da8a0d05 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 ca2021cbe4c79e104ce4fb148290fe751c5cbed0..c3720ed2f6485916901f38369c572632236f3592 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 db67c57ded6a8187e50e16a78781e93684a605fe..9d541fdab839250b0ee94e6729be25271edc1422 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 0e9831398bae0a2fbaafb794e3501d7806dd4b53..1a260270bac7b7616c20b36c7514f0951cc919aa 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 bbd1a96e56463bfbe3fb606b3a23bedb291ac5a9..3074ffdfef45e6b8264a17dc62762fb823b56351 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 5095f8d4ac15c50f2472a6943a7f7a110e60f151..c448b86d143b23516bb253b4141b18ac9e711c37 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 659244225d7fe5254c43e3390de9516c2ef72439..b29b3f5dc0bf818a0136d95214b1260fde291be1 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 0d787a8a29d45d2a9717a150f4581a7ac269ed8a..a6b18ffa4d696cf5393e9be002975768d8fd2dfc 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 5f3537dee45987e20507b495ebc4e11cb84e6724..de77678f99a2085b9ac5dbafdceeba3d71ec4e25 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 4ba007743281fa85673c25a005031fa87db92e21..e4b1333f70a85b1af9d86d49225296a632cadfa2 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 3c1f54fa08fdffe4c249b117ba655b72deafb7dc..402e7225ce5527b80b71d7f3cc9a749ecb93967c 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 ceafdb88c285c7f6b9e8d7d81613eca501be11e4..bf660dfde277e96a667627f4c8fc09203a5d9315 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 2d6b0d3575719ae7501281482e608d36a294b3d3..5ce94ad6262328e5eb960cec0ac183af7b7e2392 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 ec68ab2025d7cd084b6949d31939544b6e27e53d..22707f8621bd73227e65b006720719519d556c88 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 91a9d84118fdf0872bc69e2378b7686c5eb33d2e..4a181718350e75d932ee3c3b7791813e152853cc 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 f1069af907df42eb764ffcd5d0a31d55226f1a40..4e94db06e1c4fe6a1c6ff92ad7fdcd038f72f7c9 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 537e6c852ee5165c7a88e151d4f71e28a1e42349..84d8723799c41a7c2487618ee8084e9c8c8be68d 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 1bcb36f7be29604ebc929d6fc88a4f7e7c0b58e4..a7ffbf664d4f467b4cb163209a013ed93e5e86da 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 a257058fff92d79c36effcd323ea86f87b9a706f..18590d3d70e5857c87405205c18166303741f0d1 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 a2328f327ed654b062a3fd2b8e40524b4de4fcfe..c55d7ce755be74cc83f82bd95eeb4580dd4a710e 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 90acd1b0bae490208ca9918d9147a969746b2924..3c6735ea74052203723c8fb45c6f6624837a0fe1 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 e68b509c30432887839a92abc7df0af84d06ccc7..fda4c4e552d529325bf46b83c5a97c9004747edf 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 7cd0c65d70264221a5a0c7db818a3313a6ff0379..f0195ae203b63e9b0906f00c559dbec578776d9c 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 8594770b768b68a6daaf302a95bc6f2293ee7015..e5ccad348b054022fca68befc303069ceecce277 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 ccf005d3386e4fa2a898cfcce5439f78aa44d95d..ded554f388336bdd5feb094c110a4ebc7b5f9a87 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 820ec66820a55da40bccd5954acc3337c451a567..265a025d724abc61884064bca4fa162e427e00f0 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 85d8b7e14f45543950120ce751eec368b26acb06..d49b2137acc7a5ff75a0b07528eefa562d4a2843 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 a9571d1061226e3ed30a56b38920c3b0f4c1d0f6..9c3b7ff9f29d20a4ef68c7b03b89e18dc084f910 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 dd832dc4f1cca62371a4aa97b9432279a2f50b21..234ee57b5465943a465124bef21fc2d993377fe1 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 bfb95c89eb2d917ef95e20406d25ac3a6a27e7dd..6d1fbeb549617fa3697b9c70175c141a6e591127 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 1c528c8a34e0084c87829c2bf5efe73a9d8e385a..524bff292f08229c096c38499e4b18df14ce9975 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 6835abe3b8fd4b5e06beb50ae49ae313b8adc2c8..df0d9de67149aaeb515f7bdd0539a098bc31fb5b 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 8e1eca182a240289824fbba0f661746348486e1e..147e004209dd8b70c27699b97560adea827395d5 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 e847153401d7989960e1da5533434d60866e9106..3273b2b18b91981647f46c544cc35a26cba022b4 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 1a6cf6914ab6073bda6e688425f292b60cf24f3f..5f7268e71a2f51b3584f454d93e971bb8d9afda5 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 4b0841f28d0664d6d35001e5d0e53313af63b2bd..693c02a91c14764519b3caf8c5fc4355f3d50c08 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 cbae11bc67afe6f405b71c9c261a3129b6eb2b77..11918f710b1d75902ac3708428617adefbf0ab8e 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 55666649cc39a913a58d4af6d511b24f2d21dffc..9d18903130051149424d1bb90cb33f307895aea8 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 136e5bbb227646a438f00ac15f3e0bbd65813081..adb23b25ed446600044236609a371c72d96aaf20 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 ac0f8987b2d1d664cbe0c8e25162bba8cd93ad55..c3e1be85657d6d526863c7094f917dbcc2990a5d 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 f381dc171ea665c6474ddecfbdac6aafba3049ca..a903d76526f5f44944028c55d4b28d100a6e5092 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 6eec04d445d9604570a59fb289df1e595bf7d953..3c7d47b2edabd5b526a764e948d29806fb1eb49a 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 c2e034ece7163f45ea3673a0b2269aff8e584b13..b0ede3fe69790aa0cdcaca0953af236db257901e 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 6d7dec4ad7fef33000750429c7b37fb95b9fbd69..c45d77ef65040dd6e4fff54d058de43f4a7feb50 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 3e697d263e1f6f75617eb98e884b50ce5e6e2d33..f9da30e1f2b85ee2cf73113c5b80faabe218bc4e 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 ee9dd3a73bad7a084c0f03c8074afa5900943bd7..ece75e078569040566a40a843111edaea3af6ec8 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 c6f897b2086847cecc0e049d80e8a40f079af376..d79cf07252b241dab2ee39bafd10b7c41125b58e 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 aaa9e0f01984b95b86e6c8885570466bda8a2e35..a297fc332363b16b4571f4167e1ad0814b2d207b 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 42519715eb1d323df6859e865e2b940d5a15e8ac..b13a2f8a2787c849a20a53ef5ceaab559b39d88e 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 e1f950675d1bf3f52754c0c0fed9b146d8b313ce..ffe3a77de8e7ef2ccfb07a90dba34cff5c76cd49 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 8edf006b43551a4e332fdc0e71981990224c7b6e..734e617c1298ecb1132e09e18dffb1654330e728 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 86f821473286b3a85828a7c13af07c8268bdf89e..1f66cad87e68702a63c0ccaed4306c11028f0329 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 e1c525ca261c091110820808d853b2c2559422b3..bf315074e14cd4f157b87095206062d03f767102 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 5e02dd34e117b69949d034c70ad3e8ebded6dc87..77a9607284b67729bc931080b89dd48b7a20a584 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 8dd4562242fd7dd1794e6f0e0f8579e9f07e322b..e6edd02d44154b49b22b0ff699d3cb598db2f047 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 f7f67f0f1a34147f23d616333c2c0804cb82aa05..740c1562c6a554efcb9f7589059091ef17660950 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 b6fd43e89bd3e14a23d6fc0e0614f1e140fa3837..ee791a92846d4e55ac6625319737f851f76364e1 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 66162dc59baefa0594f7ce7572520491f5b13843..02dd245e36f33795e6096efe1c3b9fdea5defde4 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;
/**