diff --git a/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php b/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
index 457705a791a72c0693b808996b1491d617d62952..2047187206277ea123570a641c61eaaa1d682f45 100644
--- a/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
+++ b/core/modules/layout_builder/src/Entity/LayoutBuilderEntityViewDisplay.php
@@ -303,7 +303,6 @@ public function buildMultiple(array $entities) {
    */
   protected function buildSections(FieldableEntityInterface $entity) {
     $contexts = $this->getContextsForEntity($entity);
-    // @todo Remove in https://www.drupal.org/project/drupal/issues/3018782.
     $label = new TranslatableMarkup('@entity being viewed', [
       '@entity' => $entity->getEntityType()->getSingularLabel(),
     ]);
diff --git a/core/modules/layout_builder/src/Plugin/SectionStorage/OverridesSectionStorage.php b/core/modules/layout_builder/src/Plugin/SectionStorage/OverridesSectionStorage.php
index 7e17c88e7b3b86c44fac4832e72b487fa9a57852..e762ac839711f104b6bc14f630491513827a62eb 100644
--- a/core/modules/layout_builder/src/Plugin/SectionStorage/OverridesSectionStorage.php
+++ b/core/modules/layout_builder/src/Plugin/SectionStorage/OverridesSectionStorage.php
@@ -311,7 +311,6 @@ public function getLayoutBuilderUrl($rel = 'view') {
   public function getContextsDuringPreview() {
     $contexts = parent::getContextsDuringPreview();
 
-    // @todo Remove this in https://www.drupal.org/node/3018782.
     if (isset($contexts['entity'])) {
       $contexts['layout_builder.entity'] = $contexts['entity'];
       unset($contexts['entity']);