diff --git a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java
index 5414f69681..a6ea00b2db 100644
--- a/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java
+++ b/src/main/java/net/aufdemrand/denizen/npc/speech/DenizenChat.java
@@ -1,6 +1,5 @@
 package net.aufdemrand.denizen.npc.speech;
 
-import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
index 4a9a31807a..b043675613 100644
--- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
+++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java
@@ -5,7 +5,6 @@
 import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizen.tags.TagManager;
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizencore.tags.TagContext;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.persistence.Persist;
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
index 82d8cd59a9..0155d4f815 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -12,7 +12,6 @@
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
-import net.aufdemrand.denizen.utilities.entity.*;
 import net.aufdemrand.denizen.utilities.entity.Rotation;
 import net.aufdemrand.denizen.utilities.nbt.CustomNBT;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
diff --git a/src/main/java/net/aufdemrand/denizen/objects/dScript.java b/src/main/java/net/aufdemrand/denizen/objects/dScript.java
index 8379727bbe..a62d221e13 100644
--- a/src/main/java/net/aufdemrand/denizen/objects/dScript.java
+++ b/src/main/java/net/aufdemrand/denizen/objects/dScript.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.properties.Property;
 import net.aufdemrand.denizen.objects.properties.PropertyParser;
 import net.aufdemrand.denizen.scripts.ScriptRegistry;
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java
index 19a7282891..05f90789d2 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/BracedCommand.java
@@ -7,7 +7,6 @@
 import net.aufdemrand.denizen.objects.aH;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import sun.font.Script;
 
 public abstract class BracedCommand extends AbstractCommand {
 
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
index 9d227968a1..0930773333 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/WhileCommand.java
@@ -1,6 +1,5 @@
 package net.aufdemrand.denizen.scripts.commands.core;
 
-import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.tags.BukkitTagContext;
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java
index 1c7e2ee70c..bc61fbebce 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/YamlCommand.java
@@ -14,7 +14,6 @@
 import net.aufdemrand.denizencore.scripts.ScriptHelper;
 import net.aufdemrand.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.json.JSONObject;
 
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java
index 7a2122c373..d239dcc537 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BookScriptContainer.java
@@ -8,7 +8,6 @@
 import net.aufdemrand.denizen.tags.TagManager;
 import net.aufdemrand.denizen.objects.dItem;
 
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizencore.utilities.YamlConfiguration;
 import org.bukkit.Material;
 import org.bukkit.inventory.meta.BookMeta;
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java
index f9bb619da1..4c1539ba0d 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/queues/ScriptQueue.java
@@ -9,7 +9,6 @@
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;
-import net.aufdemrand.denizen.objects.properties.bukkit.BukkitScriptProperties;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizen.scripts.commands.core.DetermineCommand;
 import net.aufdemrand.denizen.scripts.queues.core.TimedQueue;
diff --git a/src/main/java/net/aufdemrand/denizen/tags/Attribute.java b/src/main/java/net/aufdemrand/denizen/tags/Attribute.java
index c1a05c9de1..2d04edd080 100644
--- a/src/main/java/net/aufdemrand/denizen/tags/Attribute.java
+++ b/src/main/java/net/aufdemrand/denizen/tags/Attribute.java
@@ -1,6 +1,5 @@
 package net.aufdemrand.denizen.tags;
 
-import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
 
diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java
index d9e9fbc5c9..193a46927d 100644
--- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java
+++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java
@@ -14,14 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Calls a bukkit event for replaceable tags.
- *
- * @author Jeremy Schroeder
- *
- */
-
-public class TagManager implements Listener {
+public class TagManager {
 
     public Denizen denizen;
 
diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java
index fee993e8fa..d8b0be5895 100644
--- a/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java
+++ b/src/main/java/net/aufdemrand/denizen/tags/core/EntityTags.java
@@ -6,16 +6,10 @@
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.tags.TagManager;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.CreatureSpawnEvent;
 
-public class EntityTags implements Listener {
+public class EntityTags{
 
     public EntityTags(Denizen denizen) {
-        denizen.getServer().getPluginManager().registerEvents(this, denizen);
         TagManager.registerTagEvents(this);
     }
 
diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java
index 78b2976998..663a07e0ea 100644
--- a/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java
+++ b/src/main/java/net/aufdemrand/denizen/tags/core/TextTags.java
@@ -6,7 +6,6 @@
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.tags.TagManager;
 import org.bukkit.ChatColor;
-import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 public class TextTags implements Listener {
diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
index d807c62bef..c6bbda79d2 100644
--- a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
+++ b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
@@ -2,12 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
 
 import net.aufdemrand.denizen.Settings;
 import net.aufdemrand.denizen.npc.traits.TriggerTrait;
diff --git a/src/main/java/net/aufdemrand/denizen/utilities/maps/MapCursor.java b/src/main/java/net/aufdemrand/denizen/utilities/maps/MapCursor.java
index 619ade737e..c56965be89 100644
--- a/src/main/java/net/aufdemrand/denizen/utilities/maps/MapCursor.java
+++ b/src/main/java/net/aufdemrand/denizen/utilities/maps/MapCursor.java
@@ -2,7 +2,6 @@
 
 import net.aufdemrand.denizen.objects.aH;
 import net.aufdemrand.denizen.objects.dPlayer;
-import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.map.MapCanvas;
 import org.bukkit.map.MapView;