diff --git a/Essentials/pom.xml b/Essentials/pom.xml
index ec316b8cf..53da3c172 100644
--- a/Essentials/pom.xml
+++ b/Essentials/pom.xml
@@ -31,11 +31,6 @@
         </plugins>
     </build>
     <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.8.7-R0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>BOSEconomy</groupId>
             <artifactId>BOSEconomy</artifactId>
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index c9cfd37ee..4fe65709c 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -1291,11 +1291,6 @@ public class OfflinePlayer implements Player {
         return base.getPlayer();
     }
 
-    @Override
-    public Spigot spigot() {
-        return base.getPlayer().spigot();
-    }
-
     @Override
     public long getFirstPlayed() {
         return base.getFirstPlayed();
diff --git a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
index 54e3345ce..728d5370b 100644
--- a/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
+++ b/Essentials/src/com/earth2me/essentials/craftbukkit/FakeWorld.java
@@ -627,11 +627,6 @@ public class FakeWorld implements World {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public Spigot spigot() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public List<Entity> getNearbyEntities(Location loc, double x, double y, double z) {
         throw new UnsupportedOperationException("Not supported yet.");
diff --git a/Essentials/src/com/earth2me/essentials/utils/SpawnerUtil.java b/Essentials/src/com/earth2me/essentials/utils/SpawnerUtil.java
index 1c25c4457..245b071d3 100644
--- a/Essentials/src/com/earth2me/essentials/utils/SpawnerUtil.java
+++ b/Essentials/src/com/earth2me/essentials/utils/SpawnerUtil.java
@@ -40,7 +40,7 @@ public class SpawnerUtil {
             ess.getLogger().info("Using BlockStateMeta for spawners");
         } else {
             ess.getLogger().warning("Using legacy item data for spawners");
-            ess.getLogger().warning(ChatColor.RED + "UPGRADE TO SPIGOT 1.8.3 OR HIGHER FOR WORKING SPAWNERS");
+            ess.getLogger().warning(ChatColor.RED + "UPGRADE TO 1.8.3 OR HIGHER FOR WORKING SPAWNERS");
         }
     }
 
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index 0bd356a00..3b262ce33 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -914,11 +914,6 @@ public class FakeServer implements Server {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    @Override
-    public Spigot spigot() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     @Override
     public BanList getBanList(BanList.Type arg0) {
         throw new UnsupportedOperationException("Not supported yet.");
diff --git a/pom.xml b/pom.xml
index 5167d453a..71a1977a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
             <version>1.8.7-R0.1-SNAPSHOT</version>
         </dependency>
         <dependency>