diff --git a/drush/features.drush.inc b/drush/features.drush.inc
index 01607cd..dc4f6fa 100644
--- a/drush/features.drush.inc
+++ b/drush/features.drush.inc
@@ -9,7 +9,6 @@ use Drupal\features\ConfigurationItem;
 use Drupal\features\FeaturesManagerInterface;
 use Drupal\features\Plugin\FeaturesGeneration\FeaturesGenerationWrite;
 use Drupal\Component\Diff\DiffFormatter;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\config_update\ConfigReverter;
 
 /**
diff --git a/modules/features_ui/features_ui.admin.inc b/modules/features_ui/features_ui.admin.inc
index c8b7d81..3e55c39 100644
--- a/modules/features_ui/features_ui.admin.inc
+++ b/modules/features_ui/features_ui.admin.inc
@@ -6,8 +6,6 @@
  */
 
 use Drupal\Core\Render\Element;
-use Drupal\Core\Template\Attribute;
-use Drupal\Core\Url;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Html;
 
diff --git a/modules/features_ui/src/Form/AssignmentBaseForm.php b/modules/features_ui/src/Form/AssignmentBaseForm.php
index b1b30cb..673aee0 100644
--- a/modules/features_ui/src/Form/AssignmentBaseForm.php
+++ b/modules/features_ui/src/Form/AssignmentBaseForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/modules/features_ui/src/Form/AssignmentConfigureForm.php b/modules/features_ui/src/Form/AssignmentConfigureForm.php
index ac6ca18..e7f95bd 100644
--- a/modules/features_ui/src/Form/AssignmentConfigureForm.php
+++ b/modules/features_ui/src/Form/AssignmentConfigureForm.php
@@ -11,9 +11,7 @@ use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\features\FeaturesManagerInterface;
 use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\Entity\FeaturesBundle;
 use Drupal\features\FeaturesBundleInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
diff --git a/modules/features_ui/src/Form/AssignmentCoreForm.php b/modules/features_ui/src/Form/AssignmentCoreForm.php
index ba32775..dbd0a98 100644
--- a/modules/features_ui/src/Form/AssignmentCoreForm.php
+++ b/modules/features_ui/src/Form/AssignmentCoreForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/modules/features_ui/src/Form/AssignmentExcludeForm.php b/modules/features_ui/src/Form/AssignmentExcludeForm.php
index 9cff3a0..9395770 100644
--- a/modules/features_ui/src/Form/AssignmentExcludeForm.php
+++ b/modules/features_ui/src/Form/AssignmentExcludeForm.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\features\FeaturesBundleInterface;
 
 /**
  * Configures the selected configuration assignment method for this site.
diff --git a/modules/features_ui/src/Form/AssignmentOptionalForm.php b/modules/features_ui/src/Form/AssignmentOptionalForm.php
index a97ef69..94dba35 100644
--- a/modules/features_ui/src/Form/AssignmentOptionalForm.php
+++ b/modules/features_ui/src/Form/AssignmentOptionalForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/modules/features_ui/src/Form/AssignmentProfileForm.php b/modules/features_ui/src/Form/AssignmentProfileForm.php
index d7a8016..1dd54c6 100644
--- a/modules/features_ui/src/Form/AssignmentProfileForm.php
+++ b/modules/features_ui/src/Form/AssignmentProfileForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/modules/features_ui/src/Form/AssignmentSiteForm.php b/modules/features_ui/src/Form/AssignmentSiteForm.php
index 6978d70..71a4266 100644
--- a/modules/features_ui/src/Form/AssignmentSiteForm.php
+++ b/modules/features_ui/src/Form/AssignmentSiteForm.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features_ui\Form;
 
-use Drupal\features_ui\Form\AssignmentFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/modules/features_ui/src/Form/FeaturesDiffForm.php b/modules/features_ui/src/Form/FeaturesDiffForm.php
index 22774e9..a43e2f5 100644
--- a/modules/features_ui/src/Form/FeaturesDiffForm.php
+++ b/modules/features_ui/src/Form/FeaturesDiffForm.php
@@ -10,11 +10,8 @@ namespace Drupal\features_ui\Form;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\features\ConfigurationItem;
 use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesGeneratorInterface;
 use Drupal\features\FeaturesManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Component\Diff\DiffFormatter;
diff --git a/modules/features_ui/src/Form/FeaturesEditForm.php b/modules/features_ui/src/Form/FeaturesEditForm.php
index f74a83d..b2815ae 100644
--- a/modules/features_ui/src/Form/FeaturesEditForm.php
+++ b/modules/features_ui/src/Form/FeaturesEditForm.php
@@ -12,9 +12,7 @@ use Drupal\Component\Utility\Xss;
 use Drupal\features\FeaturesAssignerInterface;
 use Drupal\features\FeaturesGeneratorInterface;
 use Drupal\features\FeaturesManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/modules/features_ui/src/Form/FeaturesExportForm.php b/modules/features_ui/src/Form/FeaturesExportForm.php
index a93e4a7..53447ea 100644
--- a/modules/features_ui/src/Form/FeaturesExportForm.php
+++ b/modules/features_ui/src/Form/FeaturesExportForm.php
@@ -14,7 +14,6 @@ use Drupal\features\FeaturesGeneratorInterface;
 use Drupal\features\FeaturesManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/src/FeaturesAssigner.php b/src/FeaturesAssigner.php
index 811276d..23817f6 100644
--- a/src/FeaturesAssigner.php
+++ b/src/FeaturesAssigner.php
@@ -8,9 +8,6 @@
 namespace Drupal\features;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\features\Entity\FeaturesBundle;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\FeaturesManagerInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Config\StorageInterface;
diff --git a/src/FeaturesAssignerInterface.php b/src/FeaturesAssignerInterface.php
index 3693eae..3ecf0e8 100644
--- a/src/FeaturesAssignerInterface.php
+++ b/src/FeaturesAssignerInterface.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\features;
 
-use Drupal\features\FeaturesBundleInterface;
-
 /**
  * Common interface for features assignment services.
  *
diff --git a/src/FeaturesAssignmentMethodBase.php b/src/FeaturesAssignmentMethodBase.php
index 6a3e231..bf8f6c7 100644
--- a/src/FeaturesAssignmentMethodBase.php
+++ b/src/FeaturesAssignmentMethodBase.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\features;
 
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
diff --git a/src/FeaturesAssignmentMethodInterface.php b/src/FeaturesAssignmentMethodInterface.php
index bfa422b..a2b90ce 100644
--- a/src/FeaturesAssignmentMethodInterface.php
+++ b/src/FeaturesAssignmentMethodInterface.php
@@ -9,8 +9,6 @@ namespace Drupal\features;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
 
 /**
  * Interface for package assignment classes.
diff --git a/src/FeaturesBundleInterface.php b/src/FeaturesBundleInterface.php
index c36cd91..08438df 100644
--- a/src/FeaturesBundleInterface.php
+++ b/src/FeaturesBundleInterface.php
@@ -7,11 +7,6 @@
 
 namespace Drupal\features;
 
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesGeneratorInterface;
-use Drupal\Core\Extension\Extension;
-
 /**
  * Provides an interface for the FeaturesBundle object.
  */
diff --git a/src/FeaturesConfigInstaller.php b/src/FeaturesConfigInstaller.php
index fe8d36f..5223c65 100644
--- a/src/FeaturesConfigInstaller.php
+++ b/src/FeaturesConfigInstaller.php
@@ -9,7 +9,6 @@ namespace Drupal\features;
 
 use Drupal\Core\Config\ConfigInstaller;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\features\FeaturesManagerInterface;
 
 /**
  * Class for customizing the test for pre existing configuration.
diff --git a/src/FeaturesExtensionStorages.php b/src/FeaturesExtensionStorages.php
index a933e53..a8c9554 100644
--- a/src/FeaturesExtensionStorages.php
+++ b/src/FeaturesExtensionStorages.php
@@ -10,7 +10,6 @@ namespace Drupal\features;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Extension\Extension;
-use Drupal\features\FeaturesInstallStorage;
 
 /**
  * Wraps FeaturesInstallStorage to support multiple configuration
diff --git a/src/FeaturesExtensionStoragesInterface.php b/src/FeaturesExtensionStoragesInterface.php
index 69262d8..3c58abd 100644
--- a/src/FeaturesExtensionStoragesInterface.php
+++ b/src/FeaturesExtensionStoragesInterface.php
@@ -8,7 +8,6 @@
 namespace Drupal\features;
 
 use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/src/FeaturesGenerationMethodBase.php b/src/FeaturesGenerationMethodBase.php
index 5da9201..91df9e6 100644
--- a/src/FeaturesGenerationMethodBase.php
+++ b/src/FeaturesGenerationMethodBase.php
@@ -8,9 +8,6 @@
 namespace Drupal\features;
 
 use Drupal\Component\Serialization\Yaml;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesBundleInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
diff --git a/src/FeaturesGenerationMethodInterface.php b/src/FeaturesGenerationMethodInterface.php
index 8466f89..6bc3b6d 100644
--- a/src/FeaturesGenerationMethodInterface.php
+++ b/src/FeaturesGenerationMethodInterface.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\features;
 
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
diff --git a/src/FeaturesGenerator.php b/src/FeaturesGenerator.php
index 305df0f..3d94861 100644
--- a/src/FeaturesGenerator.php
+++ b/src/FeaturesGenerator.php
@@ -8,8 +8,6 @@
 namespace Drupal\features;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
-use Drupal\features\FeaturesManagerInterface;
-use Drupal\features\FeaturesAssignerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 
diff --git a/src/FeaturesManager.php b/src/FeaturesManager.php
index 41f3dfd..a90c547 100644
--- a/src/FeaturesManager.php
+++ b/src/FeaturesManager.php
@@ -7,19 +7,10 @@
 
 namespace Drupal\features;
 use Drupal;
-use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Component\Serialization\Yaml;
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\FeaturesGeneratorInterface;
-use Drupal\features\FeaturesExtensionStorages;
-use Drupal\features\FeaturesExtensionStoragesInterface;
-use Drupal\features\FeaturesManagerInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigManagerInterface;
-use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
@@ -28,7 +19,6 @@ use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * The FeaturesManager provides helper functions for building packages.
diff --git a/src/FeaturesManagerInterface.php b/src/FeaturesManagerInterface.php
index 5adb27f..427a900 100644
--- a/src/FeaturesManagerInterface.php
+++ b/src/FeaturesManagerInterface.php
@@ -7,9 +7,6 @@
 
 namespace Drupal\features;
 
-use Drupal\features\FeaturesAssignerInterface;
-use Drupal\features\FeaturesBundleInterface;
-use Drupal\features\FeaturesGeneratorInterface;
 use Drupal\Core\Extension\Extension;
 
 /**
diff --git a/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php b/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
index f5b880a..12c5030 100644
--- a/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
+++ b/src/Plugin/FeaturesAssignment/FeaturesAssignmentExclude.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\features\Plugin\FeaturesAssignment;
 
-use Drupal\component\Utility\Unicode;
 use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\features\FeaturesManagerInterface;
 
 /**
  * Class for excluding configuration from packages.
diff --git a/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php b/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
index ea4b4f9..7e0f0f4 100644
--- a/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
+++ b/src/Plugin/FeaturesAssignment/FeaturesAssignmentExisting.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\features\Plugin\FeaturesAssignment;
 
-use Drupal\Core\Extension\Extension;
 use Drupal\features\FeaturesAssignmentMethodBase;
 use Drupal\features\FeaturesManagerInterface;
 
diff --git a/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php b/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
index 361ad17..0c06ce4 100644
--- a/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
+++ b/src/Plugin/FeaturesAssignment/FeaturesAssignmentPackages.php
@@ -8,7 +8,6 @@
 namespace Drupal\features\Plugin\FeaturesAssignment;
 
 use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\features\FeaturesManagerInterface;
 
 /**
  * Class for assigning existing modules to packages.
diff --git a/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php b/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
index d2c1693..a8c9eb4 100644
--- a/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
+++ b/src/Plugin/FeaturesAssignment/FeaturesAssignmentProfile.php
@@ -8,7 +8,6 @@
 namespace Drupal\features\Plugin\FeaturesAssignment;
 
 use Drupal\features\FeaturesAssignmentMethodBase;
-use Drupal\features\FeaturesManagerInterface;
 use Drupal\Core\Config\InstallStorage;
 
 /**
diff --git a/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php b/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
index bbc2ddd..b38b020 100644
--- a/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
+++ b/src/Plugin/FeaturesGeneration/FeaturesGenerationArchive.php
@@ -8,10 +8,8 @@
 
 namespace Drupal\features\Plugin\FeaturesGeneration;
 
-use Drupal\Component\Serialization\Yaml;
 use Drupal\features\FeaturesGenerationMethodBase;
 use Drupal\Core\Archiver\ArchiveTar;
-use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\features\FeaturesBundleInterface;
 
diff --git a/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php b/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
index 8cf4e3c..12bab1e 100644
--- a/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
+++ b/src/Plugin/FeaturesGeneration/FeaturesGenerationWrite.php
@@ -8,7 +8,6 @@
 namespace Drupal\features\Plugin\FeaturesGeneration;
 
 use Drupal\features\FeaturesGenerationMethodBase;
-use Drupal\Core\Config\InstallStorage;
 use Drupal\features\FeaturesBundleInterface;
 
 /**
diff --git a/tests/src/Unit/FeaturesManagerTest.php b/tests/src/Unit/FeaturesManagerTest.php
index 3f03d15..6e9fd09 100644
--- a/tests/src/Unit/FeaturesManagerTest.php
+++ b/tests/src/Unit/FeaturesManagerTest.php
@@ -7,15 +7,12 @@
 
 namespace Drupal\Tests\features\Unit;
 
-use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityType;
 use Drupal\features\FeaturesAssignerInterface;
 use Drupal\features\FeaturesBundleInterface;
 use Drupal\features\ConfigurationItem;
 use Drupal\features\FeaturesManager;
 use Drupal\features\FeaturesManagerInterface;
-use Drupal\migrate\Plugin\migrate\destination\Config;
 use Drupal\Tests\UnitTestCase;
 
 /**
