diff --git a/uc_ajax_admin/src/Form/AjaxAdminForm.php b/uc_ajax_admin/src/Form/AjaxAdminForm.php
index df00b48..cfcc73a 100644
--- a/uc_ajax_admin/src/Form/AjaxAdminForm.php
+++ b/uc_ajax_admin/src/Form/AjaxAdminForm.php
@@ -9,7 +9,6 @@ namespace Drupal\uc_ajax_admin\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
diff --git a/uc_ajax_admin/uc_ajax_admin.module b/uc_ajax_admin/uc_ajax_admin.module
index 62cbf2f..7455a8e 100644
--- a/uc_ajax_admin/uc_ajax_admin.module
+++ b/uc_ajax_admin/uc_ajax_admin.module
@@ -5,12 +5,10 @@
  * Configures Ajax behaviours on the Ubercart checkout page.
  */
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\uc_order\Entity\Order;
 use Drupal\uc_order\Entity\OrderProduct;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Implements hook_help().
diff --git a/uc_cart/src/Controller/CheckoutController.php b/uc_cart/src/Controller/CheckoutController.php
index b957668..5bc50e6 100644
--- a/uc_cart/src/Controller/CheckoutController.php
+++ b/uc_cart/src/Controller/CheckoutController.php
@@ -13,7 +13,6 @@ use Drupal\uc_cart\CartInterface;
 use Drupal\uc_cart\CartManagerInterface;
 use Drupal\uc_cart\Plugin\CheckoutPaneManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 
 /**
  * Controller routines for the checkout.
diff --git a/uc_cart/src/Plugin/Ubercart/CheckoutPane/BillingAddressPane.php b/uc_cart/src/Plugin/Ubercart/CheckoutPane/BillingAddressPane.php
index 687ca78..7ea1df3 100644
--- a/uc_cart/src/Plugin/Ubercart/CheckoutPane/BillingAddressPane.php
+++ b/uc_cart/src/Plugin/Ubercart/CheckoutPane/BillingAddressPane.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\uc_cart\Plugin\Ubercart\CheckoutPane;
 
-use Drupal\uc_order\OrderInterface;
-
 /**
  * Gets the user's billing address.
  *
diff --git a/uc_cart/src/Plugin/Ubercart/CheckoutPane/DeliveryAddressPane.php b/uc_cart/src/Plugin/Ubercart/CheckoutPane/DeliveryAddressPane.php
index d874362..80523a4 100644
--- a/uc_cart/src/Plugin/Ubercart/CheckoutPane/DeliveryAddressPane.php
+++ b/uc_cart/src/Plugin/Ubercart/CheckoutPane/DeliveryAddressPane.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\uc_cart\Plugin\Ubercart\CheckoutPane;
 
-use Drupal\uc_order\OrderInterface;
-
 /**
  * Gets the user's delivery information.
  *
diff --git a/uc_cart/uc_cart.api.php b/uc_cart/uc_cart.api.php
index 6e3f45d..fc7c984 100644
--- a/uc_cart/uc_cart.api.php
+++ b/uc_cart/uc_cart.api.php
@@ -5,8 +5,6 @@
  * Hooks provided by the Cart module.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * @addtogroup hooks
  * @{
diff --git a/uc_cart/uc_cart.module b/uc_cart/uc_cart.module
index 1bd4d30..a2c10b2 100644
--- a/uc_cart/uc_cart.module
+++ b/uc_cart/uc_cart.module
@@ -10,7 +10,6 @@
  * products, and checkout to be extensible.
  */
 
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 use Drupal\uc_cart\CartInterface;
diff --git a/uc_catalog/src/TreeNode.php b/uc_catalog/src/TreeNode.php
index 2471f25..686c33a 100644
--- a/uc_catalog/src/TreeNode.php
+++ b/uc_catalog/src/TreeNode.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\uc_catalog;
 
-use \Drupal\taxonomy\TermInterface;
-
 /**
  * Data structure to mimic Drupal's menu system.
  */
diff --git a/uc_file/src/Form/ActionForm.php b/uc_file/src/Form/ActionForm.php
index 8832959..0495812 100644
--- a/uc_file/src/Form/ActionForm.php
+++ b/uc_file/src/Form/ActionForm.php
@@ -9,10 +9,7 @@ namespace Drupal\uc_file\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
-
 
 /**
  * Performs file action (upload, delete, hooked in actions).
diff --git a/uc_file/src/Form/AdministerFiles.php b/uc_file/src/Form/AdministerFiles.php
index 7d0ae60..51379af 100644
--- a/uc_file/src/Form/AdministerFiles.php
+++ b/uc_file/src/Form/AdministerFiles.php
@@ -9,9 +9,6 @@ namespace Drupal\uc_file\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\Component\Serialization\Json;
-use Drupal\Component\Utility\String;
 
 /**
  * Form step values.
diff --git a/uc_file/src/Form/ShowForm.php b/uc_file/src/Form/ShowForm.php
index 611007d..11b19e3 100644
--- a/uc_file/src/Form/ShowForm.php
+++ b/uc_file/src/Form/ShowForm.php
@@ -10,7 +10,6 @@ namespace Drupal\uc_file\Form;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\SafeMarkup;
 
 /**
diff --git a/uc_order/src/Entity/OrderProduct.php b/uc_order/src/Entity/OrderProduct.php
index 47db0f9..b98e385 100644
--- a/uc_order/src/Entity/OrderProduct.php
+++ b/uc_order/src/Entity/OrderProduct.php
@@ -8,7 +8,6 @@
 namespace Drupal\uc_order\Entity;
 
 use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\uc_order\OrderProductInterface;
diff --git a/uc_order/src/Form/OrderUpdateForm.php b/uc_order/src/Form/OrderUpdateForm.php
index 838f196..26ef82a 100644
--- a/uc_order/src/Form/OrderUpdateForm.php
+++ b/uc_order/src/Form/OrderUpdateForm.php
@@ -9,7 +9,6 @@ namespace Drupal\uc_order\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\uc_order\Entity\Order;
 use Drupal\uc_order\Entity\OrderStatus;
 use Drupal\uc_order\OrderInterface;
 
diff --git a/uc_order/src/OrderForm.php b/uc_order/src/OrderForm.php
index 2db1006..b30f8f8 100644
--- a/uc_order/src/OrderForm.php
+++ b/uc_order/src/OrderForm.php
@@ -9,7 +9,6 @@ namespace Drupal\uc_order;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\uc_order\OrderInterface;
 
 /**
  * Form controller for the Ubercart order form.
diff --git a/uc_order/src/Plugin/views/field/MoneyTotal.inc b/uc_order/src/Plugin/views/field/MoneyTotal.inc
index b0048bc..57843c0 100644
--- a/uc_order/src/Plugin/views/field/MoneyTotal.inc
+++ b/uc_order/src/Plugin/views/field/MoneyTotal.inc
@@ -7,8 +7,6 @@
 
 namespace Drupal\uc_order\Plugin\views\field;
 
-use Drupal\views\Plugin\views\field\FieldPluginBase;
-
 /**
  * Total price field handler.
  *
diff --git a/uc_order/src/Plugin/views/field/WeightTotal.php b/uc_order/src/Plugin/views/field/WeightTotal.php
index 86e0ad0..b903db6 100644
--- a/uc_order/src/Plugin/views/field/WeightTotal.php
+++ b/uc_order/src/Plugin/views/field/WeightTotal.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\uc_order\Plugin\views\field;
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\uc_store\Plugin\views\field\Weight;
-use Drupal\views\ResultRow;
 
 /**
  * Total weight field handler.
diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index 59b7f30..4886738 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -11,7 +11,6 @@
  */
 
 use Drupal\Component\Discovery\YamlDiscovery;
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\BubbleableMetadata;
@@ -19,7 +18,6 @@ use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
 use Drupal\uc_order\Entity\Order;
-use Drupal\uc_order\Entity\OrderStatus;
 
 require_once dirname(__FILE__) . '/uc_order.order_pane.inc';
 require_once dirname(__FILE__) . '/uc_order.line_item.inc';
diff --git a/uc_product/src/Form/BuyItNowForm.php b/uc_product/src/Form/BuyItNowForm.php
index b39c130..1b73e4d 100644
--- a/uc_product/src/Form/BuyItNowForm.php
+++ b/uc_product/src/Form/BuyItNowForm.php
@@ -11,7 +11,6 @@ use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines a simple form for adding a product to the cart.
diff --git a/uc_stock/src/Form/StockReportForm.php b/uc_stock/src/Form/StockReportForm.php
index 5444265..37edbb6 100644
--- a/uc_stock/src/Form/StockReportForm.php
+++ b/uc_stock/src/Form/StockReportForm.php
@@ -7,10 +7,8 @@
 
 namespace Drupal\uc_stock\Form;
 
-use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 
 /**
diff --git a/uc_store/src/Encryption.php b/uc_store/src/Encryption.php
index 5ff2e15..ff58050 100644
--- a/uc_store/src/Encryption.php
+++ b/uc_store/src/Encryption.php
@@ -9,7 +9,6 @@ namespace Drupal\uc_store;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Url;
-use Drupal\uc_store\EncryptionInterface;
 
 /**
  * Handles encryption of credit-card information.
diff --git a/uc_tax/src/Controller/TaxController.php b/uc_tax/src/Controller/TaxController.php
index 374632b..3694d7e 100644
--- a/uc_tax/src/Controller/TaxController.php
+++ b/uc_tax/src/Controller/TaxController.php
@@ -8,8 +8,6 @@
 namespace Drupal\uc_tax\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Url;
 
 /**
  * Controller routines for tax routes.
diff --git a/uc_tax_report/src/Controller/SalesTaxReport.php b/uc_tax_report/src/Controller/SalesTaxReport.php
index ecbc43a..91f124d 100644
--- a/uc_tax_report/src/Controller/SalesTaxReport.php
+++ b/uc_tax_report/src/Controller/SalesTaxReport.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\uc_tax_report\Controller;
 
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 
 /**
diff --git a/uc_tax_report/src/Form/ParametersForm.php b/uc_tax_report/src/Form/ParametersForm.php
index 917c02b..9e58955 100644
--- a/uc_tax_report/src/Form/ParametersForm.php
+++ b/uc_tax_report/src/Form/ParametersForm.php
@@ -9,7 +9,6 @@ namespace Drupal\uc_tax_report\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\uc_order\Entity\OrderStatus;
 
 /**
