diff --git a/paper-api/src/main/java/org/bukkit/command/PluginCommand.java b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java
index 201645fcbd..0f4d2327a1 100644
--- a/paper-api/src/main/java/org/bukkit/command/PluginCommand.java
+++ b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java
@@ -1,7 +1,5 @@
 package org.bukkit.command;
 
-import java.awt.Color;
-
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -17,7 +15,7 @@ public final class PluginCommand extends Command {
 
     public boolean execute(Player player, String commandLabel, String[] args) {
         boolean cmdSuccess = owningPlugin.onCommand(player, this, commandLabel, args);
-        if (!cmdSuccess && usageMessage != "") {
+        if (!cmdSuccess && !usageMessage.isEmpty()) {
             String tmpMsg = usageMessage.replace("<command>", commandLabel);
             String[] usageLines = tmpMsg.split("\\n");
             for(String line: usageLines) {
diff --git a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index ed34a26460..a3899f564c 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -217,7 +217,6 @@ public final class SimplePluginManager implements PluginManager {
      */
     public void registerEvent(Event.Type type, Listener listener, Priority priority, Plugin plugin) {
         PriorityQueue<RegisteredListener> eventListeners = listeners.get(type);
-        int position = 0;
 
         if (eventListeners == null) {
             eventListeners = new PriorityQueue<RegisteredListener>(11,