diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
index ec5162d..7d0e4fb 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
@@ -7,7 +7,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Validates the LinkAccess constraint.
@@ -15,13 +14,6 @@
 class LinkAccessConstraintValidator extends ConstraintValidator implements ContainerInjectionInterface {
 
   /**
-   * Stores the validator's state during validation.
-   *
-   * @var \Symfony\Component\Validator\Context\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
    * Proxy for the current user account.
    *
    * @var \Drupal\Core\Session\AccountProxyInterface
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
index 7bd659b..52171d6 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraint.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\link\Plugin\Validation\Constraint;
 
-use Drupal\link\LinkItemInterface;
 use Symfony\Component\Validator\Constraint;
 
 /**
@@ -17,11 +16,4 @@ class LinkTypeConstraint extends Constraint {
 
   public $message = "The path '@uri' is invalid.";
 
-  /**
-   * {@inheritdoc}
-   */
-  public function validatedBy() {
-    return '\Drupal\link\Validation\LinkTypeConstraintValidator';
-  }
-
 }
diff --git a/core/modules/link/src/Validation/LinkTypeConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php
similarity index 85%
rename from core/modules/link/src/Validation/LinkTypeConstraintValidator.php
rename to core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php
index 141f2f5..a67eb4d 100644
--- a/core/modules/link/src/Validation/LinkTypeConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkTypeConstraintValidator.php
@@ -1,18 +1,13 @@
 <?php
 
-namespace Drupal\link\Validation;
+namespace Drupal\link\Plugin\Validation\Constraint;
 
 use Drupal\link\LinkItemInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
 /**
- * Validation constraint for links receiving data allowed by its settings.
- *
- * @Constraint(
- *   id = "LinkType",
- *   label = @Translation("Link data valid for link type.", context = "Validation"),
- * )
+ * Constraint validator for links receiving data allowed by its settings.
  */
 class LinkTypeConstraintValidator extends ConstraintValidator {
 
diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
index ee1329b..b500a8d 100644
--- a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
+++ b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequired.php
@@ -28,11 +28,4 @@ class UserMailRequired extends Constraint {
    */
   public $message = '@name field is required.';
 
-  /**
-   * {@inheritdoc}
-   */
-  public function validatedBy() {
-    return '\Drupal\user\Validation\UserMailRequiredValidator';
-  }
-
 }
diff --git a/core/modules/user/src/Validation/UserMailRequiredValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
similarity index 88%
rename from core/modules/user/src/Validation/UserMailRequiredValidator.php
rename to core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
index f05247c..7e20b7a 100644
--- a/core/modules/user/src/Validation/UserMailRequiredValidator.php
+++ b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\user\Validation;
+namespace Drupal\user\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Constraint;
@@ -11,11 +11,6 @@
  * The user mail field is NOT required if account originally had no mail set
  * and the user performing the edit has 'administer users' permission.
  * This allows users without email address to be edited and deleted.
- *
- * @Constraint(
- *   id = "UserMailRequired",
- *   label = @Translation("User email required", context = "Validation")
- * )
  */
 class UserMailRequiredValidator extends ConstraintValidator {