diff --git a/nanobot/channels/registry.py b/nanobot/channels/registry.py
index 4e2801ec..a933c820 100644
--- a/nanobot/channels/registry.py
+++ b/nanobot/channels/registry.py
@@ -21,7 +21,8 @@ if TYPE_CHECKING:
 
 @cache
 def _warn_legacy_channel_entry_points() -> None:
-    # TODO: Remove this legacy entry-point detection and warning after the migration window.
+    # TODO(v0.2.4): Remove this detection and warning. v0.2.3 is the final
+    # migration window for installed legacy channel entry points.
     names = sorted({entry_point.name for entry_point in entry_points(group="nanobot.channels")})
     if not names:
         return
diff --git a/nanobot/config/loader.py b/nanobot/config/loader.py
index 347c1c29..90da366f 100644
--- a/nanobot/config/loader.py
+++ b/nanobot/config/loader.py
@@ -209,8 +209,8 @@ def _migrate_config(data: dict) -> dict:
         defaults.pop("maxMessages", None)
         defaults.pop("max_messages", None)
         if had_legacy_max_messages:
-            # TODO(next version): Remove this legacy cleanup branch; the schema
-            # will silently ignore this field once the warning grace period ends.
+            # TODO(v0.2.4): Remove this legacy cleanup branch. v0.2.3 is the
+            # final release that warns before the schema silently ignores the field.
             logger.warning(
                 "agents.defaults.maxMessages/max_messages is legacy and ignored; "
                 "replay max messages is now an internal safety cap. Remove it from "