diff --git a/cck_select_other.views.inc b/cck_select_other.views.inc
index 6bcfe2d..fb689bf 100644
--- a/cck_select_other.views.inc
+++ b/cck_select_other.views.inc
@@ -4,8 +4,6 @@
  * Contains \cck_select_other_views_data_alter().
  */
 
-use Drupal\Component\Utility\NestedArray;
-
 /**
  * Implements of hook_views_data_alter().
  */
diff --git a/src/Plugin/Field/FieldFormatter/SelectOtherFormatter.php b/src/Plugin/Field/FieldFormatter/SelectOtherFormatter.php
index 7d89d9b..dede9c9 100644
--- a/src/Plugin/Field/FieldFormatter/SelectOtherFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/SelectOtherFormatter.php
@@ -8,8 +8,6 @@
 namespace Drupal\cck_select_other\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\AllowedTagsXssTrait;
-use Drupal\Core\Field\Annotation\FieldFormatter;
-use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Field\FieldItemListInterface;
 
diff --git a/src/Plugin/Field/FieldWidget/SelectOtherWidget.php b/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
index 9dc8011..b82e27b 100644
--- a/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
+++ b/src/Plugin/Field/FieldWidget/SelectOtherWidget.php
@@ -10,9 +10,7 @@ namespace Drupal\cck_select_other\Plugin\Field\FieldWidget;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FieldItemInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsWidgetBase;
 
diff --git a/src/Tests/CCKSelectOtherDefaultValueTest.php b/src/Tests/CCKSelectOtherDefaultValueTest.php
index 2602a1b..2906ae8 100644
--- a/src/Tests/CCKSelectOtherDefaultValueTest.php
+++ b/src/Tests/CCKSelectOtherDefaultValueTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that a default value is selected.
  *
diff --git a/src/Tests/CCKSelectOtherEmptyTest.php b/src/Tests/CCKSelectOtherEmptyTest.php
index 69b31bd..dad2fff 100644
--- a/src/Tests/CCKSelectOtherEmptyTest.php
+++ b/src/Tests/CCKSelectOtherEmptyTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that an empty value is not saved.
  *
diff --git a/src/Tests/CCKSelectOtherHTMLEntitiesTest.php b/src/Tests/CCKSelectOtherHTMLEntitiesTest.php
index ecf434a..23f1aa7 100644
--- a/src/Tests/CCKSelectOtherHTMLEntitiesTest.php
+++ b/src/Tests/CCKSelectOtherHTMLEntitiesTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that HTML entities are not encoded properly.
  *
diff --git a/src/Tests/CCKSelectOtherIntegerFieldTest.php b/src/Tests/CCKSelectOtherIntegerFieldTest.php
index 23a7d11..d99ecc1 100644
--- a/src/Tests/CCKSelectOtherIntegerFieldTest.php
+++ b/src/Tests/CCKSelectOtherIntegerFieldTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert list_integer field values saved correctly.
  *
diff --git a/src/Tests/CCKSelectOtherMultipleFieldTest.php b/src/Tests/CCKSelectOtherMultipleFieldTest.php
index 09b71ad..48ad89a 100644
--- a/src/Tests/CCKSelectOtherMultipleFieldTest.php
+++ b/src/Tests/CCKSelectOtherMultipleFieldTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that two select other fields work on the same node.
  *
diff --git a/src/Tests/CCKSelectOtherMultipleValueTest.php b/src/Tests/CCKSelectOtherMultipleValueTest.php
index 27b199d..c161734 100644
--- a/src/Tests/CCKSelectOtherMultipleValueTest.php
+++ b/src/Tests/CCKSelectOtherMultipleValueTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that multiple values are saved properly.
  *
diff --git a/src/Tests/CCKSelectOtherRequiredTest.php b/src/Tests/CCKSelectOtherRequiredTest.php
index fe3d3db..7c6038b 100644
--- a/src/Tests/CCKSelectOtherRequiredTest.php
+++ b/src/Tests/CCKSelectOtherRequiredTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert that required fields work correctly.
  *
diff --git a/src/Tests/CCKSelectOtherTextFieldTest.php b/src/Tests/CCKSelectOtherTextFieldTest.php
index 655fb63..1bcb47b 100644
--- a/src/Tests/CCKSelectOtherTextFieldTest.php
+++ b/src/Tests/CCKSelectOtherTextFieldTest.php
@@ -6,8 +6,6 @@
 
 namespace Drupal\cck_select_other\Tests;
 
-use Drupal\cck_select_other\Tests\CCKSelectOtherTestBase;
-
 /**
  * Assert field values saved correctly for list text fields.
  *