diff --git a/core/modules/path/path.module b/core/modules/path/path.module
index 3d7f1d0..2064c36 100644
--- a/core/modules/path/path.module
+++ b/core/modules/path/path.module
@@ -84,7 +84,30 @@ function path_entity_base_field_info(EntityTypeInterface $entity_type) {
 function path_entity_translation_delete(EntityInterface $translation) {
   if ($translation->hasLinkTemplate('canonical')) {
     $path = $translation->urlInfo()->getInternalPath();
-    $conditions = array('source' => '/' . $path, 'langcode' => $translation->language()->getId());
+    $conditions = array(
+      'source' => '/' . $path,
+      'langcode' => $translation->language()->getId()
+    );
     \Drupal::service('path.alias_storage')->delete($conditions);
   }
 }
+  /**
+ * Implements hook_path_update().
+ */
+function path_path_update() {
+  \Drupal::service('path.alias_manager')->cacheClear();
+}
+
+/**
+ * Implements hook_path_insert().
+ */
+function path_path_insert() {
+  \Drupal::service('path.alias_manager')->cacheClear();
+}
+
+/**
+ * Implements hook_path_delete().
+ */
+function path_path_delete($path) {
+  \Drupal::service('path.alias_manager')->cacheClear();
+}
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 738b52e..a3edf82 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -1418,32 +1418,18 @@ function system_block_view_system_main_block_alter(array &$build, BlockPluginInt
 }
 
 /**
- * Implements hook_path_update().
- */
-function system_path_update($path) {
-  $alias_manager = \Drupal::service('path.alias_manager');
-  $alias_manager->cacheClear($path['source']);
-  $alias_manager->cacheClear($path['original']['source']);
-}
-
-/**
- * Implements hook_path_insert().
- */
-function system_path_insert($path) {
-  \Drupal::service('path.alias_manager')->cacheClear($path['source']);
-}
-
-/**
- * Implements hook_path_delete().
- */
-function system_path_delete($path) {
-  \Drupal::service('path.alias_manager')->cacheClear($path['source']);
-}
-
-/**
  * Implements hook_query_TAG_alter() for entity reference selection handlers.
  */
 function system_query_entity_reference_alter(AlterableInterface $query) {
   $handler = $query->getMetadata('entity_reference_selection_handler');
   $handler->entityQueryAlter($query);
 }
+
+/**
+ * Implements hook_block_view_BASE_BLOCK_ID_alter().
+ */
+function system_block_view_system_help_block_alter(array &$build, BlockPluginInterface $block) {
+  // Assume that most users do not need or want to perform contextual actions on
+  // the help block, so don't needlessly draw attention to it.
+  unset($build['#contextual_links']);
+}