diff --git a/src/com/wasteofplastic/acidisland/commands/AdminCmd.java b/src/com/wasteofplastic/acidisland/commands/AdminCmd.java
index 69166fa..a612bf4 100644
--- a/src/com/wasteofplastic/acidisland/commands/AdminCmd.java
+++ b/src/com/wasteofplastic/acidisland/commands/AdminCmd.java
@@ -63,8 +63,8 @@
 import com.wasteofplastic.acidisland.PlayerCache;
 import com.wasteofplastic.acidisland.SafeSpotTeleport;
 import com.wasteofplastic.acidisland.Settings;
-import com.wasteofplastic.acidisland.TopTen;
 import com.wasteofplastic.acidisland.Settings.GameType;
+import com.wasteofplastic.acidisland.TopTen;
 import com.wasteofplastic.acidisland.panels.ControlPanel;
 import com.wasteofplastic.acidisland.util.Util;
 import com.wasteofplastic.acidisland.util.VaultHelper;
diff --git a/src/com/wasteofplastic/acidisland/commands/Challenges.java b/src/com/wasteofplastic/acidisland/commands/Challenges.java
index c85979b..9a54d30 100644
--- a/src/com/wasteofplastic/acidisland/commands/Challenges.java
+++ b/src/com/wasteofplastic/acidisland/commands/Challenges.java
@@ -51,7 +51,6 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.SpawnEgg;
 import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
 
 import com.wasteofplastic.acidisland.ASkyBlock;
diff --git a/src/com/wasteofplastic/acidisland/commands/IslandCmd.java b/src/com/wasteofplastic/acidisland/commands/IslandCmd.java
index bf20d05..5277fea 100644
--- a/src/com/wasteofplastic/acidisland/commands/IslandCmd.java
+++ b/src/com/wasteofplastic/acidisland/commands/IslandCmd.java
@@ -68,11 +68,11 @@
 import com.wasteofplastic.acidisland.DeleteIslandChunk;
 import com.wasteofplastic.acidisland.GridManager;
 import com.wasteofplastic.acidisland.Island;
+import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.LevelCalc;
 import com.wasteofplastic.acidisland.LevelCalcByChunk;
 import com.wasteofplastic.acidisland.Settings;
 import com.wasteofplastic.acidisland.TopTen;
-import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.events.IslandJoinEvent;
 import com.wasteofplastic.acidisland.events.IslandLeaveEvent;
 import com.wasteofplastic.acidisland.events.IslandNewEvent;
diff --git a/src/com/wasteofplastic/acidisland/listeners/IslandGuard.java b/src/com/wasteofplastic/acidisland/listeners/IslandGuard.java
index 1817a95..a39146f 100644
--- a/src/com/wasteofplastic/acidisland/listeners/IslandGuard.java
+++ b/src/com/wasteofplastic/acidisland/listeners/IslandGuard.java
@@ -89,9 +89,9 @@
 
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.Island;
+import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.SafeBoat;
 import com.wasteofplastic.acidisland.Settings;
-import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.events.IslandEnterEvent;
 import com.wasteofplastic.acidisland.events.IslandExitEvent;
 import com.wasteofplastic.acidisland.util.Util;
diff --git a/src/com/wasteofplastic/acidisland/listeners/IslandGuardNew.java b/src/com/wasteofplastic/acidisland/listeners/IslandGuardNew.java
index 140e295..4c0f044 100644
--- a/src/com/wasteofplastic/acidisland/listeners/IslandGuardNew.java
+++ b/src/com/wasteofplastic/acidisland/listeners/IslandGuardNew.java
@@ -33,8 +33,8 @@
 
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.Island;
-import com.wasteofplastic.acidisland.Settings;
 import com.wasteofplastic.acidisland.Island.Flags;
+import com.wasteofplastic.acidisland.Settings;
 import com.wasteofplastic.acidisland.util.Util;
 import com.wasteofplastic.acidisland.util.VaultHelper;
 
diff --git a/src/com/wasteofplastic/acidisland/listeners/NetherPortals.java b/src/com/wasteofplastic/acidisland/listeners/NetherPortals.java
index 6bd7c30..cc8cf2c 100644
--- a/src/com/wasteofplastic/acidisland/listeners/NetherPortals.java
+++ b/src/com/wasteofplastic/acidisland/listeners/NetherPortals.java
@@ -42,9 +42,9 @@
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.GridManager;
 import com.wasteofplastic.acidisland.Island;
+import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.SafeSpotTeleport;
 import com.wasteofplastic.acidisland.Settings;
-import com.wasteofplastic.acidisland.Island.Flags;
 import com.wasteofplastic.acidisland.commands.IslandCmd;
 import com.wasteofplastic.acidisland.schematics.Schematic;
 import com.wasteofplastic.acidisland.util.VaultHelper;
diff --git a/src/com/wasteofplastic/acidisland/listeners/PlayerEvents.java b/src/com/wasteofplastic/acidisland/listeners/PlayerEvents.java
index b4dff68..2057d47 100644
--- a/src/com/wasteofplastic/acidisland/listeners/PlayerEvents.java
+++ b/src/com/wasteofplastic/acidisland/listeners/PlayerEvents.java
@@ -21,34 +21,24 @@
 import java.util.List;
 import java.util.UUID;
 
-import net.minecraft.server.v1_9_R1.BlockPosition;
-import net.minecraft.server.v1_9_R1.TileEntitySign;
-
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_9_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.metadata.MetadataValue;
-import org.bukkit.metadata.Metadatable;
 
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.InventorySave;
diff --git a/src/com/wasteofplastic/acidisland/nms/v1_9_R1/NMSHandler.java b/src/com/wasteofplastic/acidisland/nms/v1_9_R1/NMSHandler.java
index 9f5efc3..7c64ce4 100644
--- a/src/com/wasteofplastic/acidisland/nms/v1_9_R1/NMSHandler.java
+++ b/src/com/wasteofplastic/acidisland/nms/v1_9_R1/NMSHandler.java
@@ -37,11 +37,8 @@
 import org.bukkit.craftbukkit.v1_9_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionType;
 
 import com.wasteofplastic.acidisland.nms.NMSAbstraction;
-import com.wasteofplastic.acidisland.util.Potion1_9;
 import com.wasteofplastic.org.jnbt.CompoundTag;
 import com.wasteofplastic.org.jnbt.ListTag;
 import com.wasteofplastic.org.jnbt.StringTag;
diff --git a/src/com/wasteofplastic/acidisland/panels/SettingsPanel.java b/src/com/wasteofplastic/acidisland/panels/SettingsPanel.java
index c08d16c..8aedca0 100644
--- a/src/com/wasteofplastic/acidisland/panels/SettingsPanel.java
+++ b/src/com/wasteofplastic/acidisland/panels/SettingsPanel.java
@@ -36,8 +36,8 @@
 
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.Island;
-import com.wasteofplastic.acidisland.Settings;
 import com.wasteofplastic.acidisland.Island.Flags;
+import com.wasteofplastic.acidisland.Settings;
 
 public class SettingsPanel implements Listener {
     // Island Guard Settings Panel
diff --git a/src/com/wasteofplastic/acidisland/panels/WarpPanel.java b/src/com/wasteofplastic/acidisland/panels/WarpPanel.java
index 897f711..e752be1 100644
--- a/src/com/wasteofplastic/acidisland/panels/WarpPanel.java
+++ b/src/com/wasteofplastic/acidisland/panels/WarpPanel.java
@@ -42,8 +42,8 @@
 
 import com.wasteofplastic.acidisland.ASkyBlock;
 import com.wasteofplastic.acidisland.Island;
-import com.wasteofplastic.acidisland.Settings;
 import com.wasteofplastic.acidisland.Island.Flags;
+import com.wasteofplastic.acidisland.Settings;
 
 public class WarpPanel implements Listener {
     private ASkyBlock plugin;