diff --git a/spring-shell-core/src/main/java/org/springframework/shell/Shell.java b/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
index 6cbe59e5..f26ca9cc 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/Shell.java
@@ -33,7 +33,6 @@ import javax.validation.ConstraintViolation;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
 
 import org.jline.utils.Signals;
 
@@ -149,7 +148,7 @@ public class Shell implements CommandRegistry {
 	/**
 	 * Evaluate a single "line" of input from the user by trying to map words to a command and
 	 * arguments.
-	 * 
+	 *
 	 * <p>
 	 * This method does not throw exceptions, it catches them and returns them as a regular
 	 * result
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/AttributedCharSequenceResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/AttributedCharSequenceResultHandler.java
index 965b9da9..81c8ed4f 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/AttributedCharSequenceResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/AttributedCharSequenceResultHandler.java
@@ -19,7 +19,6 @@ package org.springframework.shell.result;
 import org.jline.utils.AttributedCharSequence;
 
 import org.springframework.shell.ResultHandler;
-import org.springframework.stereotype.Component;
 
 /**
  * A {@link ResultHandler} that knows how to render JLine's {@link AttributedCharSequence}.
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/DefaultResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/DefaultResultHandler.java
index ee9bc66b..5317af80 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/DefaultResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/DefaultResultHandler.java
@@ -17,7 +17,6 @@
 package org.springframework.shell.result;
 
 import org.springframework.shell.ResultHandler;
-import org.springframework.stereotype.Component;
 
 /**
  * A simple {@link ResultHandler} that deals with Objects (hence comes as a last resort)
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/IterableResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/IterableResultHandler.java
index 3feac6b4..ec397bb9 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/IterableResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/IterableResultHandler.java
@@ -17,7 +17,6 @@
 package org.springframework.shell.result;
 
 import org.springframework.shell.ResultHandler;
-import org.springframework.stereotype.Component;
 
 /**
  * A {@link ResultHandler} that deals with {@link Iterable}s and delegates to
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/ParameterValidationExceptionResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/ParameterValidationExceptionResultHandler.java
index a25e156b..7ffbce6b 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/ParameterValidationExceptionResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/ParameterValidationExceptionResultHandler.java
@@ -16,24 +16,24 @@
 
 package org.springframework.shell.result;
 
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import javax.validation.ElementKind;
+import javax.validation.Path;
+
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.AttributedStyle;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.shell.ParameterDescription;
 import org.springframework.shell.ParameterResolver;
 import org.springframework.shell.ParameterValidationException;
 import org.springframework.shell.Utils;
-import org.springframework.stereotype.Component;
-
-import javax.validation.ElementKind;
-import javax.validation.Path;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 /**
  * Displays validation errors on the terminal.
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/TerminalSizeAwareResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/TerminalSizeAwareResultHandler.java
index 2e19837a..ddf77320 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/TerminalSizeAwareResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/TerminalSizeAwareResultHandler.java
@@ -16,7 +16,6 @@
 
 package org.springframework.shell.result;
 
-import org.springframework.shell.ResultHandler;
 import org.springframework.shell.TerminalSizeAware;
 
 /**
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/ThrowableResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/ThrowableResultHandler.java
index 5662f98f..7fcda340 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/ThrowableResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/ThrowableResultHandler.java
@@ -25,7 +25,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.shell.CommandRegistry;
 import org.springframework.shell.ResultHandler;
 import org.springframework.shell.jline.InteractiveShellApplicationRunner;
-import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
 /**
diff --git a/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java b/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
index c29869da..e4ab047a 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/result/TypeHierarchyResultHandler.java
@@ -16,8 +16,6 @@
 
 package org.springframework.shell.result;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
diff --git a/spring-shell-samples/src/main/java/org/springframework/shell/samples/SpringShellSample.java b/spring-shell-samples/src/main/java/org/springframework/shell/samples/SpringShellSample.java
index 0a397d16..640c3fb2 100644
--- a/spring-shell-samples/src/main/java/org/springframework/shell/samples/SpringShellSample.java
+++ b/spring-shell-samples/src/main/java/org/springframework/shell/samples/SpringShellSample.java
@@ -16,7 +16,6 @@
 
 package org.springframework.shell.samples;
 
-import org.jline.terminal.Terminal;
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStyle;
 
diff --git a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Help.java b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Help.java
index 38ceeff1..628dda86 100644
--- a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Help.java
+++ b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Help.java
@@ -16,11 +16,6 @@
 
 package org.springframework.shell.standard.commands;
 
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
-import static java.util.stream.Collectors.toCollection;
-import static java.util.stream.Collectors.toMap;
-
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.List;
@@ -33,21 +28,30 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 
-import org.hibernate.validator.internal.engine.MessageInterpolatorContext;
+import javax.validation.MessageInterpolator;
+import javax.validation.Validation;
+import javax.validation.ValidatorFactory;
+import javax.validation.metadata.ConstraintDescriptor;
+
 import org.jline.utils.AttributedStringBuilder;
 import org.jline.utils.AttributedStyle;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.shell.*;
+import org.springframework.shell.Availability;
+import org.springframework.shell.CommandRegistry;
+import org.springframework.shell.MethodTarget;
+import org.springframework.shell.ParameterDescription;
+import org.springframework.shell.ParameterResolver;
+import org.springframework.shell.Utils;
 import org.springframework.shell.standard.CommandValueProvider;
 import org.springframework.shell.standard.ShellComponent;
 import org.springframework.shell.standard.ShellMethod;
 import org.springframework.shell.standard.ShellOption;
 
-import javax.validation.MessageInterpolator;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.metadata.ConstraintDescriptor;
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.toCollection;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * A command to display help about all available commands.
diff --git a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Script.java b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Script.java
index c1d439cb..ba14e341 100644
--- a/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Script.java
+++ b/spring-shell-standard-commands/src/main/java/org/springframework/shell/standard/commands/Script.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.io.Reader;
 
 import org.jline.reader.Parser;
-import org.springframework.shell.Input;
+
 import org.springframework.shell.Shell;
 import org.springframework.shell.jline.FileInputProvider;
 import org.springframework.shell.standard.ShellComponent;
diff --git a/spring-shell-standard/src/main/java/org/springframework/shell/standard/CommandValueProvider.java b/spring-shell-standard/src/main/java/org/springframework/shell/standard/CommandValueProvider.java
index 86beec8a..d8145e15 100644
--- a/spring-shell-standard/src/main/java/org/springframework/shell/standard/CommandValueProvider.java
+++ b/spring-shell-standard/src/main/java/org/springframework/shell/standard/CommandValueProvider.java
@@ -19,13 +19,10 @@ package org.springframework.shell.standard;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.MethodParameter;
+import org.springframework.shell.CommandRegistry;
 import org.springframework.shell.CompletionContext;
 import org.springframework.shell.CompletionProposal;
-import org.springframework.shell.CommandRegistry;
-import org.springframework.stereotype.Component;
 
 /**
  * A {@link ValueProvider} that can be used to auto-complete names of shell commands.
diff --git a/spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java b/spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java
index 6d757089..789f3ee8 100644
--- a/spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java
+++ b/spring-shell-standard/src/main/java/org/springframework/shell/standard/EnumValueProvider.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.springframework.core.MethodParameter;
 import org.springframework.shell.CompletionContext;
 import org.springframework.shell.CompletionProposal;
-import org.springframework.stereotype.Component;
 
 /**
  * A {@link ValueProvider} that knows how to complete values for {@link Enum} typed parameters.
diff --git a/spring-shell-standard/src/main/java/org/springframework/shell/standard/FileValueProvider.java b/spring-shell-standard/src/main/java/org/springframework/shell/standard/FileValueProvider.java
index 6842e3e7..7098bd26 100644
--- a/spring-shell-standard/src/main/java/org/springframework/shell/standard/FileValueProvider.java
+++ b/spring-shell-standard/src/main/java/org/springframework/shell/standard/FileValueProvider.java
@@ -16,20 +16,19 @@
 
 package org.springframework.shell.standard;
 
-import org.springframework.core.MethodParameter;
-import org.springframework.shell.CompletionContext;
-import org.springframework.shell.CompletionProposal;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.FileVisitOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.springframework.core.MethodParameter;
+import org.springframework.shell.CompletionContext;
+import org.springframework.shell.CompletionProposal;
+
 import static java.nio.file.FileVisitOption.FOLLOW_LINKS;
 
 /**