Issue #2051923 follow-up by andypost: Remaining clean-up from renames.

core/modules/comment/lib/Drupal/comment/Plugin/field/formatter/CommentDefaultFormatter.php

@@ -14,9 +14,7 @@
 use Drupal\field\Annotation\FieldFormatter;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
-use Drupal\Core\Entity\Field\FieldInterface;
 use Drupal\field\Plugin\Type\Formatter\FormatterBase;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

core/modules/comment/lib/Drupal/comment/Plugin/field/widget/CommentWidget.php

@@ -8,9 +8,8 @@
 namespace Drupal\comment\Plugin\field\widget;
 
 use Drupal\Core\Entity\Field\FieldItemListInterface;
-use Drupal\field\Annotation\FieldWidget;
 use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Entity\Field\FieldInterface;
+use Drupal\field\Annotation\FieldWidget;
 use Drupal\field\Plugin\Type\Widget\WidgetBase;
 
 /**