diff --git a/modules/thunder_article/src/Breadcrumb/ThunderArticleBreadcrumbBuilder.php b/modules/thunder_article/src/Breadcrumb/ThunderArticleBreadcrumbBuilder.php
index 380ca24..ddea820 100644
--- a/modules/thunder_article/src/Breadcrumb/ThunderArticleBreadcrumbBuilder.php
+++ b/modules/thunder_article/src/Breadcrumb/ThunderArticleBreadcrumbBuilder.php
@@ -7,31 +7,18 @@
 
 namespace Drupal\thunder_article\Breadcrumb;
 
-use Drupal\Component\Utility\Unicode;
-use Drupal\Core\Access\AccessManagerInterface;
 use Drupal\Core\Breadcrumb\Breadcrumb;
 use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Link;
 use Drupal\Core\ParamConverter\ParamNotConvertedException;
-use Drupal\Core\Path\CurrentPathStack;
-use Drupal\Core\PathProcessor\InboundPathProcessorInterface;
-use Drupal\Core\Routing\RequestContext;
-use Drupal\Core\Routing\RouteMatch;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\Core\Url;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
-use Drupal\node\NodeInterface;
 use Drupal\node\Entity\Node;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\taxonomy\TermStorageInterface;
 
 /**
  * Class to define the menu_link breadcrumb builder.
diff --git a/modules/thunder_media/src/Plugin/ImageEffect/AutoAspectEffect.php b/modules/thunder_media/src/Plugin/ImageEffect/AutoAspectEffect.php
index 2af46ef..2a84f21 100644
--- a/modules/thunder_media/src/Plugin/ImageEffect/AutoAspectEffect.php
+++ b/modules/thunder_media/src/Plugin/ImageEffect/AutoAspectEffect.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\thunder_media\Plugin\ImageEffect;
 
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Image\ImageInterface;
 use Drupal\image\ConfigurableImageEffectBase;
diff --git a/modules/thunder_taxonomy/thunder_taxonomy.install b/modules/thunder_taxonomy/thunder_taxonomy.install
index cc6d3e4..637dad1 100644
--- a/modules/thunder_taxonomy/thunder_taxonomy.install
+++ b/modules/thunder_taxonomy/thunder_taxonomy.install
@@ -1,8 +1,5 @@
 <?php
 
-use Drupal\Core\Language\LanguageManager;
-use Drupal\taxonomy\Entity\Term;
-
 /**
  * Implements hook_install().
  */
diff --git a/src/Installer/Form/ModuleConfigureForm.php b/src/Installer/Form/ModuleConfigureForm.php
index 64af7bf..63ccac2 100644
--- a/src/Installer/Form/ModuleConfigureForm.php
+++ b/src/Installer/Form/ModuleConfigureForm.php
@@ -12,7 +12,6 @@ use Drupal\Core\Extension\ModuleInstallerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\thunder\Installer\Form\OptionalModules\AdIntegration;
-use Drupal\thunder\Installer\Form\OptionalModules\BreakpointJsSettings;
 use Drupal\thunder\Installer\Form\OptionalModules\FacebookInstantArticles;
 use Drupal\thunder\Installer\Form\OptionalModules\GoogleAnalytics;
 use Drupal\thunder\Installer\Form\OptionalModules\HierarchicalConfig;
diff --git a/src/Installer/Form/OptionalModules/AdIntegration.php b/src/Installer/Form/OptionalModules/AdIntegration.php
index 32fb51a..7b81d2e 100644
--- a/src/Installer/Form/OptionalModules/AdIntegration.php
+++ b/src/Installer/Form/OptionalModules/AdIntegration.php
@@ -2,10 +2,7 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 
 /**
  * @file
diff --git a/src/Installer/Form/OptionalModules/BreakpointJsSettings.php b/src/Installer/Form/OptionalModules/BreakpointJsSettings.php
index b36769f..3a5f3ef 100644
--- a/src/Installer/Form/OptionalModules/BreakpointJsSettings.php
+++ b/src/Installer/Form/OptionalModules/BreakpointJsSettings.php
@@ -2,11 +2,6 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
 /**
  * @file
  * Contains
diff --git a/src/Installer/Form/OptionalModules/FacebookInstantArticles.php b/src/Installer/Form/OptionalModules/FacebookInstantArticles.php
index dbdebf3..c824a97 100644
--- a/src/Installer/Form/OptionalModules/FacebookInstantArticles.php
+++ b/src/Installer/Form/OptionalModules/FacebookInstantArticles.php
@@ -2,11 +2,6 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
 /**
  * @file
  * Contains
diff --git a/src/Installer/Form/OptionalModules/HierarchicalConfig.php b/src/Installer/Form/OptionalModules/HierarchicalConfig.php
index 10b304e..3e2ec8b 100644
--- a/src/Installer/Form/OptionalModules/HierarchicalConfig.php
+++ b/src/Installer/Form/OptionalModules/HierarchicalConfig.php
@@ -2,11 +2,6 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
 /**
  * @file
  * Contains
diff --git a/src/Installer/Form/OptionalModules/IvwIntegration.php b/src/Installer/Form/OptionalModules/IvwIntegration.php
index 0b2f5d6..6884126 100644
--- a/src/Installer/Form/OptionalModules/IvwIntegration.php
+++ b/src/Installer/Form/OptionalModules/IvwIntegration.php
@@ -2,10 +2,7 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 
 /**
  * @file
diff --git a/src/Installer/Form/OptionalModules/RiddleIntegration.php b/src/Installer/Form/OptionalModules/RiddleIntegration.php
index 773f656..76aa7a4 100644
--- a/src/Installer/Form/OptionalModules/RiddleIntegration.php
+++ b/src/Installer/Form/OptionalModules/RiddleIntegration.php
@@ -2,10 +2,7 @@
 
 namespace Drupal\thunder\Installer\Form\OptionalModules;
 
-use Drupal\Core\Extension\ModuleInstallerInterface;
-use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 
 /**
  * @file
diff --git a/src/Tests/Installer/ThunderInstallerGermanTest.php b/src/Tests/Installer/ThunderInstallerGermanTest.php
index ddc8576..6105bcf 100644
--- a/src/Tests/Installer/ThunderInstallerGermanTest.php
+++ b/src/Tests/Installer/ThunderInstallerGermanTest.php
@@ -6,15 +6,7 @@
  */
 
 namespace Drupal\thunder\Tests\Installer;
-use Drupal\Core\DrupalKernel;
-use Drupal\Core\Language\Language;
-use Drupal\Core\Session\UserSession;
-use Drupal\Core\Site\Settings;
-use Drupal\simpletest\InstallerTestBase;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
+
 /**
  * Tests the interactive installer installing the standard profile.
  *