diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php
index 33905bb..167f7aa 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/argument_validator/TermName.php
@@ -9,10 +9,8 @@
 
 use Drupal\views\ViewExecutable;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\views\Plugin\views\argument_validator\Entity;
-use Drupal\views\Annotation\ViewsArgumentValidator;
 
 /**
  * Validates whether a term name is a valid term argument.
@@ -30,6 +28,7 @@ class TermName extends Entity {
    *
    * @var \Drupal\taxonomy\TermStorageControllerInterface
    */
+  protected $termStorageController;
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Entity.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Entity.php
index 08289fc..49a8420 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Entity.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument_validator/Entity.php
@@ -10,7 +10,6 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\views\Plugin\views\argument\ArgumentPluginBase;
-use Drupal\views\Annotation\ViewsArgumentValidator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**