core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php   | 1 -
 core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php | 1 -
 core/modules/user/src/Plugin/views/access/Role.php                   | 1 -
 core/modules/views/src/Plugin/views/display/Page.php                 | 5 +----
 core/modules/views/src/Plugin/views/row/RssPluginBase.php            | 2 +-
 core/modules/views_ui/src/ViewUI.php                                 | 2 ++
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 5d7252a..f37453e 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -61,7 +61,6 @@ class TaxonomyIndexTid extends ManyToOne {
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, VocabularyStorageInterface $vocabulary_storage, TermStorageInterface $term_storage) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->is_handler = TRUE;
     $this->vocabularyStorage = $vocabulary_storage;
     $this->termStorage = $term_storage;
   }
diff --git a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
index b57a940..6113057 100644
--- a/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
+++ b/core/modules/taxonomy/src/Plugin/views/relationship/NodeTermData.php
@@ -44,7 +44,6 @@ class NodeTermData extends RelationshipPluginBase  {
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, VocabularyStorageInterface $vocabulary_storage) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->is_handler = TRUE;
     $this->vocabularyStorage = $vocabulary_storage;
   }
 
diff --git a/core/modules/user/src/Plugin/views/access/Role.php b/core/modules/user/src/Plugin/views/access/Role.php
index 954ea4f..345086d 100644
--- a/core/modules/user/src/Plugin/views/access/Role.php
+++ b/core/modules/user/src/Plugin/views/access/Role.php
@@ -54,7 +54,6 @@ class Role extends AccessPluginBase {
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, RoleStorageInterface $role_storage) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->is_handler = TRUE;
     $this->roleStorage = $role_storage;
   }
 
diff --git a/core/modules/views/src/Plugin/views/display/Page.php b/core/modules/views/src/Plugin/views/display/Page.php
index 540f6db..c422ac8 100644
--- a/core/modules/views/src/Plugin/views/display/Page.php
+++ b/core/modules/views/src/Plugin/views/display/Page.php
@@ -66,9 +66,6 @@ class Page extends PathPluginBase {
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, RouteProviderInterface $route_provider, StateInterface $state, EntityStorageInterface $menu_storage) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $route_provider, $state);
-
-    $this->routeProvider = $route_provider;
-    $this->state = $state;
     $this->menuStorage = $menu_storage;
   }
 
@@ -483,7 +480,7 @@ public function calculateDependencies() {
 
     $menu = $this->getOption('menu');
     if ($menu['type'] === 'normal') {
-      $menu_entity = \Drupal::entityManager()->getStorage('menu')->load($menu['menu_name']);
+      $menu_entity = $this->menuStorage->load($menu['menu_name']);
       $dependencies[$menu_entity->getConfigDependencyKey()][] = $menu_entity->getConfigDependencyName();
     }
 
diff --git a/core/modules/views/src/Plugin/views/row/RssPluginBase.php b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
index b8187be..ed1e5b9 100644
--- a/core/modules/views/src/Plugin/views/row/RssPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
@@ -89,7 +89,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    * Return the main options, which are shown in the summary title.
    */
   public function buildOptionsForm_summary_options() {
-    $view_modes = \Drupal::entityManager()->getViewModes($this->entityTypeId);
+    $view_modes = $this->entityManager->getViewModes($this->entityTypeId);
     $options = array();
     foreach ($view_modes as $mode => $settings) {
       $options[$mode] = $settings['label'];
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index ef9da7f..58a1734 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -1130,12 +1130,14 @@ public function calculateDependencies() {
    * {@inheritdoc}
    */
   public function getConfigDependencyKey() {
+    return $this->storage->getConfigDependencyKey();
   }
 
   /**
    * {@inheritdoc}
    */
   public function getConfigDependencyName() {
+    return $this->storage->getConfigDependencyName();
   }
 
   /**