diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutController.php b/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutController.php
index 0cb8674..077cd08 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Controller/ShortcutController.php
@@ -7,6 +7,7 @@
 namespace Drupal\shortcut\Controller;
 
 use Drupal\Core\ControllerInterface;
+use Drupal\Core\Entity\EntityManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -15,16 +16,33 @@
 class ShortcutController implements ControllerInterface {
 
   /**
+   * Stores the Entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * Constructs a new \Drupal\views_ui\Routing\ViewsUIController object.
+   *
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The Entity manager.
+   */
+   public function __construct(EntityManager $entity_manager) {
+     $this->entityManager = $entity_manager;
+   }
+
+  /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static();
+    return new static($container->get('plugin.manager.entity'));
   }
 
   /**
    * Presents a list of layouts.
    */
   public function shortcutSetAdmin() {
-    return entity_list_controller('shortcut')->render();
+    return $this->entityManager->getListcontroller('shortcut')->render();
   }
 }
diff --git a/core/modules/xmlrpc/xmlrpc.module b/core/modules/xmlrpc/xmlrpc.module
index fe1fcbc..1f6f1c1 100644
--- a/core/modules/xmlrpc/xmlrpc.module
+++ b/core/modules/xmlrpc/xmlrpc.module
@@ -26,10 +26,8 @@ function xmlrpc_help($path, $args) {
 function xmlrpc_menu() {
   $items['xmlrpc.php'] = array(
     'title' => 'XML-RPC',
-    'page callback' => 'xmlrpc_server_page',
-    'access callback' => TRUE,
+    'route_name' => 'xmlrpc_server_page',
     'type' => MENU_CALLBACK,
-    'file' => 'xmlrpc.server.inc',
   );
   return $items;
 }
diff --git a/core/modules/xmlrpc/xmlrpc.server.inc b/core/modules/xmlrpc/xmlrpc.server.inc
index e1c160b..2c53781 100644
--- a/core/modules/xmlrpc/xmlrpc.server.inc
+++ b/core/modules/xmlrpc/xmlrpc.server.inc
@@ -6,14 +6,6 @@
  */
 
 /**
- * Process an XML-RPC request.
- */
-function xmlrpc_server_page() {
-  module_load_include('inc', 'xmlrpc');
-  xmlrpc_server(module_invoke_all('xmlrpc'));
-}
-
-/**
  * Invokes XML-RPC methods on this server.
  *
  * @param array $callbacks