diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 8851673..d719571 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -2679,6 +2679,7 @@ function menu_router_build() {
  *   The router item to modify.
  * @param string $path
  *   The path this router item is for.
+ *
  * @return array
  *   The modified router item, including the path pattern from the route in the
  *   'path' key.
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
index 062465e..ce3911d 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Plugin/Core/Entity/MenuLink.php
@@ -235,14 +235,14 @@ class MenuLink extends Entity implements \ArrayAccess, ContentEntityInterface {
   public $updated = 0;
 
   /**
-   * The name of the route associated with this Link, if any.
+   * The name of the route associated with this menu link, if any.
    *
    * @var string
    */
   public $route_name;
 
   /**
-   * The route object associated with this Link, if any.
+   * The route object associated with this menu link, if any.
    *
    * @var \Symfony\Component\Routing\Route
    */
@@ -267,8 +267,8 @@ public function createDuplicate() {
   /**
    * Returns the Route object associated with this link, if any.
    *
-   * @return \Symfony\Component\Routing\Route
-   *   The route object for this Link, or NULL if there isn't one.
+   * @return \Symfony\Component\Routing\Route|null
+   *   The route object for this menu link, or NULL if there isn't one.
    */
   public function getRoute() {
     if (!$this->route_name) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php
index 5cb4e15..3059164 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterPermissionTest.php
@@ -33,7 +33,6 @@ public static function getInfo() {
    * Tests permission requirements on routes.
    */
   public function testPermissionAccess() {
-
     $this->drupalGet('router_test/test7');
     $this->assertResponse(403, "Access denied for a route where we don't have a permission");
 
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index fcf69eb..1320ca4 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -875,20 +875,6 @@ function user_register_access() {
  * Implements hook_menu().
  */
 function user_menu() {
-  // @todo Remove once drupal_valid_path() is fixed to find and access check
-  //   paths managed by the new routing system: http://drupal.org/node/1793520.
-  $items['user/autocomplete'] = array(
-    'title' => 'User autocomplete',
-    'route_name' => 'user_autocomplete',
-    'type' => MENU_CALLBACK,
-  );
-
-  $items['user/autocomplete/anonymous'] = array(
-    'title' => 'User autocomplete including anonymous',
-    'route_name' => 'user_autocomplete_anonymous',
-    'type' => MENU_CALLBACK,
-  );
-
   // Registration and login pages.
   $items['user'] = array(
     'title' => 'User account',