diff --git a/core/lib/Drupal/Core/Form/FormInterface.php b/core/lib/Drupal/Core/Form/FormInterface.php
index a8b3fa288d..2cafbebfa0 100644
--- a/core/lib/Drupal/Core/Form/FormInterface.php
+++ b/core/lib/Drupal/Core/Form/FormInterface.php
@@ -10,21 +10,6 @@
 interface FormInterface {
 
   /**
-   * Disabled option on forms and settings
-   */
-  const DISABLED = 0;
-
-  /**
-   * Optional option on forms and settings
-   */
-  const OPTIONAL = 1;
-
-  /**
-   * Required option on forms and settings
-   */
-  const REQUIRED = 2;
-
-  /**
    * Returns a unique string identifying the form.
    *
    * @return string
diff --git a/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php b/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
index aabc45ca22..c64c47f427 100644
--- a/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuLinkManagerInterface.php
@@ -23,12 +23,6 @@
 interface MenuLinkManagerInterface extends PluginManagerInterface {
 
   /**
-   * Maximum length of menu name as entered by the user. Database length is 32
-   * and we add a menu- prefix.
-   */
-  const MAX_MENU_NAME_LENGTH_UI = 27;
-
-  /**
    * Triggers discovery, save, and cleanup of discovered links.
    */
   public function rebuild();
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 52e438d0e0..bb3ec23dfb 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -24,11 +24,9 @@
 /**
  * Maximum length of menu name as entered by the user.
  *
- * Database length is 32 and we add a menu- prefix.
- *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Menu\MenuLinkManagerInterface::MAX_MENU_NAME_LENGTH_UI
- *   instead.
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\Core\Config\Entity\ConfigEntityStorage::MAX_ID_LENGTH because the
+ *   menu name is a configuration entity ID.
  */
 const MENU_MAX_MENU_NAME_LENGTH_UI = 27;
 
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 3beac056e1..359368d5b0 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -17,12 +17,19 @@
 /**
  * The machine name for the empty image breakpoint image style option.
  *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
- *   Use \Drupal\responsive_image\ResponsiveImageStyleInterface::EMPTY_IMAGE
- *   and \Drupal\responsive_image\ResponsiveImageStyleInterface::ORIGINAL_IMAGE
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   Drupal\responsive_image\ResponsiveImageStyleInterface::EMPTY_IMAGE
  *   instead.
  */
 const RESPONSIVE_IMAGE_EMPTY_IMAGE = '_empty image_';
+
+/**
+ * The machine name for the original image breakpoint image style option.
+ *
+ * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0. Use
+ *   \Drupal\responsive_image\ResponsiveImageStyleInterface::ORIGINAL_IMAGE
+ *   instead.
+ */
 const RESPONSIVE_IMAGE_ORIGINAL_IMAGE = '_original image_';
 
 /**
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php b/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
index 3e1e5c0cf6..226797188a 100644
--- a/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
@@ -13,6 +13,10 @@
    * The machine name for the empty image breakpoint image style option.
    */
   const EMPTY_IMAGE = '_empty image_';
+
+  /**
+   * The machine name for the original image breakpoint image style option.
+   */
   const ORIGINAL_IMAGE = '_original image_';
 
   /**
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 024239032a..b6f97747d7 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -53,26 +53,17 @@
 const DRUPAL_USER_TIMEZONE_SELECT = 2;
 
 /**
- * Disabled option on forms and settings.
- *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Form\FormInterface::DISABLED instead.
+ * Disabled option on forms and settings
  */
 const DRUPAL_DISABLED = 0;
 
 /**
- * Optional option on forms and settings.
- *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Form\FormInterface::OPTIONAL instead.
+ * Optional option on forms and settings
  */
 const DRUPAL_OPTIONAL = 1;
 
 /**
- * Required option on forms and settings.
- *
- * @deprecated in Drupal 8.3.x and will be removed before Drupal 9.0.0.
- *   Use \Drupal\Core\Form\FormInterface::REQUIRED instead.
+ * Required option on forms and settings
  */
 const DRUPAL_REQUIRED = 2;