diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 87b43f7..5261b16 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -33,10 +33,6 @@
    * This is needed when the entity utilizes a PluginBag, to dictate where the
    * plugin configuration should be stored.
    *
-   * @todo Move this to a trait along with
-   *   \Drupal\Core\Config\Entity\EntityWithPluginBagInterface, and give it a
-   *   default value of 'configuration'.
-   *
    * @var string
    */
   protected $pluginConfigKey;
@@ -115,8 +111,6 @@ public function get($property_name) {
    * {@inheritdoc}
    */
   public function set($property_name, $value) {
-    // @todo When \Drupal\Core\Config\Entity\EntityWithPluginBagInterface moves
-    //   to a trait, switch to class_uses() instead.
     if ($this instanceof EntityWithPluginBagInterface) {
       if ($property_name == $this->pluginConfigKey) {
         // If external code updates the settings, pass it along to the plugin.
@@ -220,8 +214,6 @@ public function getExportProperties() {
   public function preSave(EntityStorageControllerInterface $storage_controller) {
     parent::preSave($storage_controller);
 
-    // @todo When \Drupal\Core\Config\Entity\EntityWithPluginBagInterface moves
-    //   to a trait, switch to class_uses() instead.
     if ($this instanceof EntityWithPluginBagInterface) {
       // Any changes to the plugin configuration must be saved to the entity's
       // copy as well.
diff --git a/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php b/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
index 44c5958..0d40954 100644
--- a/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/EntityWithPluginBagInterface.php
@@ -11,8 +11,6 @@
  * Provides an interface for an object utilizing a plugin bag.
  *
  * @see \Drupal\Component\Plugin\PluginBag
- *
- * @todo Turn this into a trait.
  */
 interface EntityWithPluginBagInterface extends ConfigEntityInterface {
 
@@ -20,8 +18,6 @@
    * Returns the plugin bag used by this entity.
    *
    * @return \Drupal\Component\Plugin\PluginBag
-   *
-   * @todo Make this protected.
    */
   public function getPluginBag();