diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 6d985be913..f8b62283f6 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -456,9 +456,6 @@ function watchdog_exception($type, Exception $exception, $message = NULL, $varia
  *
  * @see drupal_get_messages()
  * @see status-messages.html.twig
- *
- * @deprecated in Drupal 8.5.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal::service('messenger')->addMessage() instead.
  */
 function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE) {
   /* @var \Drupal\Core\Messenger\MessengerInterface $messenger */
@@ -491,12 +488,6 @@ function drupal_set_message($message = NULL, $type = 'status', $repeat = FALSE)
  *
  * @see drupal_set_message()
  * @see status-messages.html.twig
- *
- * @deprecated in Drupal 8.5.0, will be removed before Drupal 9.0.0.
- *   Use \Drupal::service('messenger')->getMessages() or
- *   \Drupal::service('messenger')->getMessagesByType() instead.
- *
- * @see https://www.drupal.org/node/2774931
  */
 function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
   /** @var \Drupal\Core\Messenger\MessengerInterface $messenger */
diff --git a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
index 93821313b3..8c9751f3d8 100644
--- a/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
+++ b/core/lib/Drupal/Core/Messenger/LegacyMessenger.php
@@ -10,7 +10,6 @@
  * A legacy implementation of the messenger interface.
  *
  * @internal
- * @deprecated Deprecated as of Drupal 8.5.x
  */
 class LegacyMessenger implements MessengerInterface {
 
diff --git a/core/lib/Drupal/Core/Messenger/MessengerInterface.php b/core/lib/Drupal/Core/Messenger/MessengerInterface.php
index 941a3eebcc..216835bcea 100644
--- a/core/lib/Drupal/Core/Messenger/MessengerInterface.php
+++ b/core/lib/Drupal/Core/Messenger/MessengerInterface.php
@@ -6,6 +6,8 @@
  * Stores runtime messages sent out to individual users on the page.
  *
  * An example for these messages is for example: "Content X got saved".
+ *
+ * @internal
  */
 interface MessengerInterface {