diff --git a/src/balor/OpenInv/PlayerNotFound.java b/src/balor/OpenInv/PlayerNotFound.java
index cd734a3..3b69df9 100644
--- a/src/balor/OpenInv/PlayerNotFound.java
+++ b/src/balor/OpenInv/PlayerNotFound.java
@@ -16,7 +16,6 @@
  ************************************************************************/
 package balor.OpenInv;
 
-import org.bukkit.command.CommandSender;
 
 /**
  * @author Balor (aka Antoine Aflalo)
diff --git a/src/lishid/openinv/OpenInv.java b/src/lishid/openinv/OpenInv.java
index f472266..fc00b40 100644
--- a/src/lishid/openinv/OpenInv.java
+++ b/src/lishid/openinv/OpenInv.java
@@ -16,7 +16,11 @@
 
 package lishid.openinv;
 
-import lishid.openinv.commands.*;
+import lishid.openinv.commands.AnyChestPluginCommand;
+import lishid.openinv.commands.OpenInvPluginCommand;
+import lishid.openinv.commands.SearchInvPluginCommand;
+import lishid.openinv.commands.SilentChestPluginCommand;
+import lishid.openinv.commands.ToggleOpenInvPluginCommand;
 import lishid.openinv.utils.Metrics;
 
 import org.bukkit.ChatColor;
diff --git a/src/lishid/openinv/OpenInvEntityListener.java b/src/lishid/openinv/OpenInvEntityListener.java
index 9d3bac9..b763dd6 100644
--- a/src/lishid/openinv/OpenInvEntityListener.java
+++ b/src/lishid/openinv/OpenInvEntityListener.java
@@ -18,11 +18,11 @@ package lishid.openinv;
 
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 
 public class OpenInvEntityListener implements Listener{
 	OpenInv plugin;
diff --git a/src/lishid/openinv/commands/OpenInvPluginCommand.java b/src/lishid/openinv/commands/OpenInvPluginCommand.java
index b21d300..695df93 100644
--- a/src/lishid/openinv/commands/OpenInvPluginCommand.java
+++ b/src/lishid/openinv/commands/OpenInvPluginCommand.java
@@ -16,22 +16,14 @@
 
 package lishid.openinv.commands;
 
-import java.io.File;
 import java.util.HashMap;
 
 import lishid.openinv.OpenInv;
 
-import net.minecraft.server.EntityPlayer;
-import net.minecraft.server.ItemInWorldManager;
-import net.minecraft.server.MinecraftServer;
-
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import balor.OpenInv.InventoryManager;
@@ -63,7 +55,6 @@ public class OpenInvPluginCommand implements CommandExecutor {
 		}
 
 		Player player = (Player) sender;
-		boolean Offline = false;
 
 		// History management
 		String history = openInvHistory.get(player);
diff --git a/src/lishid/openinv/utils/Metrics.java b/src/lishid/openinv/utils/Metrics.java
index 364cc43..e365777 100644
--- a/src/lishid/openinv/utils/Metrics.java
+++ b/src/lishid/openinv/utils/Metrics.java
@@ -28,11 +28,6 @@ package lishid.openinv.utils;
  * either expressed or implied, of anybody else.
  */
 
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -50,6 +45,11 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+
 /**
  * <p>
  * The metrics class obtains data about a plugin and submits statistics about it to the metrics backend.