diff --git a/src/main/java/org/openrewrite/java/apache/httpclient5/NewStatusLine.java b/src/main/java/org/openrewrite/java/apache/httpclient5/NewStatusLine.java
index ced96dc04..4b0de10c1 100644
--- a/src/main/java/org/openrewrite/java/apache/httpclient5/NewStatusLine.java
+++ b/src/main/java/org/openrewrite/java/apache/httpclient5/NewStatusLine.java
@@ -18,7 +18,10 @@
 import org.openrewrite.ExecutionContext;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
-import org.openrewrite.java.*;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.java.JavaTemplate;
+import org.openrewrite.java.JavaVisitor;
+import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.tree.J;
 
 public class NewStatusLine extends Recipe {
diff --git a/src/main/java/org/openrewrite/java/spring/boot2/ChangeEmbeddedServletContainerCustomizer.java b/src/main/java/org/openrewrite/java/spring/boot2/ChangeEmbeddedServletContainerCustomizer.java
index 6f4636661..6913817a4 100644
--- a/src/main/java/org/openrewrite/java/spring/boot2/ChangeEmbeddedServletContainerCustomizer.java
+++ b/src/main/java/org/openrewrite/java/spring/boot2/ChangeEmbeddedServletContainerCustomizer.java
@@ -24,8 +24,6 @@
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.TypeUtils;
 
-import java.util.NoSuchElementException;
-
 import static java.util.Objects.requireNonNull;
 
 public class ChangeEmbeddedServletContainerCustomizer extends Recipe {
diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MigrateRestTemplateBuilderTimeoutByInt.java b/src/main/java/org/openrewrite/java/spring/boot2/MigrateRestTemplateBuilderTimeoutByInt.java
index fc2632507..3d87c65c9 100644
--- a/src/main/java/org/openrewrite/java/spring/boot2/MigrateRestTemplateBuilderTimeoutByInt.java
+++ b/src/main/java/org/openrewrite/java/spring/boot2/MigrateRestTemplateBuilderTimeoutByInt.java
@@ -15,7 +15,10 @@
  */
 package org.openrewrite.java.spring.boot2;
 
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
diff --git a/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java b/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
index 90bc1d66e..0cfa112df 100644
--- a/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
+++ b/src/main/java/org/openrewrite/java/spring/framework/MigrateInstantiationAwareBeanPostProcessorAdapter.java
@@ -26,8 +26,6 @@
 import org.openrewrite.java.tree.TypeUtils;
 import org.openrewrite.marker.Markers;
 
-import java.util.Collections;
-
 import static java.util.Collections.emptyList;
 
 public class MigrateInstantiationAwareBeanPostProcessorAdapter extends Recipe {
diff --git a/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java b/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java
index d2f28336f..107d68549 100644
--- a/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java
+++ b/src/main/java/org/openrewrite/java/spring/framework/MigrateWebMvcConfigurerAdapter.java
@@ -15,7 +15,10 @@
  */
 package org.openrewrite.java.spring.framework;
 
-import org.openrewrite.*;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.JavaParser;
 import org.openrewrite.java.JavaTemplate;
diff --git a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/LoggingShutdownHooksTest.java b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/LoggingShutdownHooksTest.java
index 31e7cd93f..c9ca127e6 100644
--- a/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/LoggingShutdownHooksTest.java
+++ b/src/testWithSpringBoot_2_4/java/org/openrewrite/java/spring/boot2/search/LoggingShutdownHooksTest.java
@@ -22,7 +22,8 @@
 import org.openrewrite.test.RewriteTest;
 import org.openrewrite.test.SourceSpecs;
 
-import static org.openrewrite.java.Assertions.*;
+import static org.openrewrite.java.Assertions.java;
+import static org.openrewrite.java.Assertions.srcMainJava;
 import static org.openrewrite.maven.Assertions.pomXml;
 
 /**