diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
index b21c4b54..8a40271b 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsCommand.java
@@ -523,7 +523,7 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter {
                 "\"extra\":[{\"text\":\"\u00A7eRemove\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Remove the selected portal\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/portal gui remove " + portalName + "\"}}"
                 + ",{\"text\":\"  \"},{\"text\":\"\u00A7eShow\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Show the selected portal\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/portal show " + portalName + "\"}}"
                 + ",{\"text\":\"  \"},{\"text\":\"\u00A7eRename\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Change the name of the portal\"},\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/portal rename \"}}"
-                + ",{\"text\":\"  \"},{\"text\":\"\u00A7eActivate\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Teleport to the set destination\n(same as entering the portal)\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/warp " + destination + "\"}}]}", player);
+                + ",{\"text\":\"  \"},{\"text\":\"\u00A7eActivate\",\"hoverEvent\":{\"action\":\"show_text\",\"value\":\"Teleport to the set destination\n(same as entering the portal)\"},\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/desti warp " + destination + "\"}}]}", player);
 
         sender.sendMessage("");
 
diff --git a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
index 36fc170d..077fce82 100644
--- a/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
+++ b/src/com/sekwah/advancedportals/AdvancedPortalsPlugin.java
@@ -1,14 +1,13 @@
 package com.sekwah.advancedportals;
 
 import com.sekwah.advancedportals.compat.CraftBukkit;
-import com.sekwah.advancedportals.destinations.*;
+import com.sekwah.advancedportals.destinations.Destination;
+import com.sekwah.advancedportals.destinations.DestinationCommand;
 import com.sekwah.advancedportals.effects.WarpEffects;
 import com.sekwah.advancedportals.listeners.*;
 import com.sekwah.advancedportals.portals.Portal;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.io.IOException;
-
 public class AdvancedPortalsPlugin extends JavaPlugin {
 
     public CraftBukkit compat = null;
diff --git a/src/com/sekwah/advancedportals/ConfigAccessor.java b/src/com/sekwah/advancedportals/ConfigAccessor.java
index 3a6483ed..73b646f3 100644
--- a/src/com/sekwah/advancedportals/ConfigAccessor.java
+++ b/src/com/sekwah/advancedportals/ConfigAccessor.java
@@ -6,7 +6,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.logging.Level;
 
 public class ConfigAccessor {
diff --git a/src/com/sekwah/advancedportals/api/warphandler/TagHandler.java b/src/com/sekwah/advancedportals/api/warphandler/TagHandler.java
index f61cb529..bfe97e94 100644
--- a/src/com/sekwah/advancedportals/api/warphandler/TagHandler.java
+++ b/src/com/sekwah/advancedportals/api/warphandler/TagHandler.java
@@ -1,6 +1,5 @@
 package com.sekwah.advancedportals.api.warphandler;
 
-import com.sekwah.advancedportals.portals.Portal;
 import org.bukkit.entity.Player;
 
 /**
diff --git a/src/com/sekwah/advancedportals/compat/CraftBukkit.java b/src/com/sekwah/advancedportals/compat/CraftBukkit.java
index dbb15d3c..d7d954a4 100644
--- a/src/com/sekwah/advancedportals/compat/CraftBukkit.java
+++ b/src/com/sekwah/advancedportals/compat/CraftBukkit.java
@@ -7,7 +7,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 
 /**
  * Created by on 02/08/2016.
diff --git a/src/com/sekwah/advancedportals/destinations/Destination.java b/src/com/sekwah/advancedportals/destinations/Destination.java
index a3726e84..a8a66b4a 100644
--- a/src/com/sekwah/advancedportals/destinations/Destination.java
+++ b/src/com/sekwah/advancedportals/destinations/Destination.java
@@ -7,17 +7,10 @@ import com.sekwah.advancedportals.effects.WarpEffects;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.inventory.InventoryView;
-import org.bukkit.metadata.FixedMetadataValue;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
 import java.util.logging.Level;
 
 public class Destination {
diff --git a/src/com/sekwah/advancedportals/destinations/DestinationCommand.java b/src/com/sekwah/advancedportals/destinations/DestinationCommand.java
index 483854d9..d2ad461c 100644
--- a/src/com/sekwah/advancedportals/destinations/DestinationCommand.java
+++ b/src/com/sekwah/advancedportals/destinations/DestinationCommand.java
@@ -9,7 +9,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
 
 public class DestinationCommand implements CommandExecutor, TabCompleter {
 
diff --git a/src/com/sekwah/advancedportals/listeners/FlowStopper.java b/src/com/sekwah/advancedportals/listeners/FlowStopper.java
index 6942db77..9f23ccb4 100644
--- a/src/com/sekwah/advancedportals/listeners/FlowStopper.java
+++ b/src/com/sekwah/advancedportals/listeners/FlowStopper.java
@@ -2,9 +2,7 @@ package com.sekwah.advancedportals.listeners;
 
 import com.sekwah.advancedportals.AdvancedPortalsPlugin;
 import com.sekwah.advancedportals.ConfigAccessor;
-import com.sekwah.advancedportals.portals.AdvancedPortal;
 import com.sekwah.advancedportals.portals.Portal;
-import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
diff --git a/src/com/sekwah/advancedportals/listeners/Listeners.java b/src/com/sekwah/advancedportals/listeners/Listeners.java
index ffbfe9ae..13f0fcec 100644
--- a/src/com/sekwah/advancedportals/listeners/Listeners.java
+++ b/src/com/sekwah/advancedportals/listeners/Listeners.java
@@ -6,7 +6,10 @@ import com.sekwah.advancedportals.PluginMessages;
 import com.sekwah.advancedportals.api.events.WarpEvent;
 import com.sekwah.advancedportals.portals.AdvancedPortal;
 import com.sekwah.advancedportals.portals.Portal;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/com/sekwah/advancedportals/listeners/PortalProtect.java b/src/com/sekwah/advancedportals/listeners/PortalProtect.java
index 3e683c33..209ef812 100644
--- a/src/com/sekwah/advancedportals/listeners/PortalProtect.java
+++ b/src/com/sekwah/advancedportals/listeners/PortalProtect.java
@@ -2,7 +2,6 @@ package com.sekwah.advancedportals.listeners;
 
 import com.sekwah.advancedportals.AdvancedPortalsPlugin;
 import com.sekwah.advancedportals.ConfigAccessor;
-import com.sekwah.advancedportals.portals.AdvancedPortal;
 import com.sekwah.advancedportals.portals.Portal;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;