diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandIssuer.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandIssuer.java
index 24c9d4d3..1f2f6706 100644
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandIssuer.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandIssuer.java
@@ -47,7 +47,6 @@ public class BukkitCommandIssuer implements CommandIssuer {
 
     @Override
     public CommandSender getIssuer() {
-        //noinspection unchecked
         return sender;
     }
 
diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
index 1e6c9de2..ec29eb08 100755
--- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
+++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java
@@ -92,7 +92,6 @@ public class BukkitCommandManager extends CommandManager<
     private boolean cantReadLocale = false;
     protected boolean autoDetectFromClient = true;
 
-    @SuppressWarnings("JavaReflectionMemberAccess")
     public BukkitCommandManager(Plugin plugin) {
         this.plugin = plugin;
         String prefix = this.plugin.getDescription().getPrefix();
diff --git a/core/src/main/java/co/aikar/commands/ACFPatterns.java b/core/src/main/java/co/aikar/commands/ACFPatterns.java
index 1d354777..96ad2ef8 100644
--- a/core/src/main/java/co/aikar/commands/ACFPatterns.java
+++ b/core/src/main/java/co/aikar/commands/ACFPatterns.java
@@ -55,7 +55,6 @@ final class ACFPatterns {
     private ACFPatterns() {
     }
 
-    @SuppressWarnings("Convert2MethodRef")
     static final Map<String, Pattern> patternCache = ExpiringMap.builder()
             .maxSize(200)
             .expiration(1, TimeUnit.HOURS)
diff --git a/core/src/main/java/co/aikar/commands/ACFUtil.java b/core/src/main/java/co/aikar/commands/ACFUtil.java
index f40f0c98..4beede31 100644
--- a/core/src/main/java/co/aikar/commands/ACFUtil.java
+++ b/core/src/main/java/co/aikar/commands/ACFUtil.java
@@ -576,7 +576,6 @@ public final class ACFUtil {
 
     public static boolean isFloat(String string) {
         try {
-            //noinspection ResultOfMethodCallIgnored
             Float.parseFloat(string);
             return true;
         } catch (Exception e) {
@@ -586,7 +585,6 @@ public final class ACFUtil {
 
     public static boolean isDouble(String string) {
         try {
-            //noinspection ResultOfMethodCallIgnored
             Double.parseDouble(string);
             return true;
         } catch (Exception e) {
@@ -610,7 +608,7 @@ public final class ACFUtil {
     }
 
     private static <T extends Throwable> T superSneaky(Throwable t) throws T {
-        //noinspection ConstantConditions,unchecked
+        // noinspection unchecked
         throw (T) t;
     }
 
diff --git a/core/src/main/java/co/aikar/commands/Annotations.java b/core/src/main/java/co/aikar/commands/Annotations.java
index 92e840a2..8a14724c 100644
--- a/core/src/main/java/co/aikar/commands/Annotations.java
+++ b/core/src/main/java/co/aikar/commands/Annotations.java
@@ -32,8 +32,7 @@ import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-@SuppressWarnings("TypeParameterExplicitlyExtendsObject")
-class Annotations <M extends CommandManager> extends AnnotationLookups {
+class Annotations<M extends CommandManager> extends AnnotationLookups {
 
     public static final int NOTHING = 0;
     public static final int REPLACEMENTS = 1;
diff --git a/core/src/main/java/co/aikar/commands/CommandConditions.java b/core/src/main/java/co/aikar/commands/CommandConditions.java
index 1409c5aa..c56906c1 100644
--- a/core/src/main/java/co/aikar/commands/CommandConditions.java
+++ b/core/src/main/java/co/aikar/commands/CommandConditions.java
@@ -31,11 +31,11 @@ import java.util.Locale;
 import java.util.Map;
 
 @SuppressWarnings("BooleanMethodIsAlwaysInverted") // No IDEA, you are wrong
-public class CommandConditions <
+public class CommandConditions<
         I extends CommandIssuer,
         CEC extends CommandExecutionContext<CEC, I>,
         CC extends ConditionContext<I>
-    > {
+        > {
     private CommandManager manager;
     private Map<String, Condition<I>> conditions = new HashMap<>();
     private Table<Class<?>, String, ParameterCondition<?, ?, ?>> paramConditions = new Table<>();
@@ -88,7 +88,6 @@ public class CommandConditions <
             String config = split.length == 2 ? split[1] : null;
             //noinspection unchecked
             CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
-            //noinspection unchecked
             condition.validateCondition(conditionContext);
         }
     }
@@ -117,7 +116,7 @@ public class CommandConditions <
 
             if (condition == null) {
                 RegisteredCommand cmd = execContext.getCmd();
-                this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
+                this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" + execContext.getParam().getName());
                 continue;
             }
             String config = split.length == 2 ? split[1] : null;
@@ -129,11 +128,11 @@ public class CommandConditions <
         }
     }
 
-    public interface Condition <I extends CommandIssuer> {
+    public interface Condition<I extends CommandIssuer> {
         void validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
     }
 
-    public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
+    public interface ParameterCondition<P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
         void validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
     }
 }
diff --git a/core/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
index c84cef4b..a7346f65 100644
--- a/core/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -225,7 +225,6 @@ public class RegisteredCommand<CEC extends CommandExecutionContext<CEC, ? extend
             final CommandParameter<CEC> parameter = parameters[i];
             final String parameterName = parameter.getName();
             final Class<?> type = parameter.getType();
-            //noinspection unchecked
             final ContextResolver<?, CEC> resolver = parameter.getResolver();
             //noinspection unchecked
             CEC context = (CEC) this.manager.createCommandContext(this, parameter, sender, args, i, passedArgs);
diff --git a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
index 9ef3cf82..6dab2e18 100644
--- a/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
+++ b/velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
@@ -55,7 +55,6 @@ public class ACFVelocityUtil {
         }
 
         Optional<Player> exactMatch = server.getPlayer(partialName);
-        //noinspection OptionalIsPresent
         if (exactMatch.isPresent()) {
             return Collections.singleton(exactMatch.get());
         }