diff --git a/pom.xml b/pom.xml
index 9b8eb1dd..6438bb69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     </licenses>
 
     <organization>
-        <name>Total Freedom</name>
+        <name>TotalFreedom</name>
         <url>https://totalfreedom.me</url>
     </organization>
 
@@ -39,11 +39,6 @@
     </scm>
 
     <repositories>
-        <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
-        </repository>
-
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -142,21 +137,14 @@
         <dependency>
             <groupId>com.github.TFPatches</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>89efd2c93e</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.TFPatches</groupId>
-            <artifactId>TotalFreedomMod</artifactId>
-            <version>4a91c81</version>
+            <version>11aea9b3cd</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.github.TFPatches</groupId>
             <artifactId>TF-WorldEdit</artifactId>
-            <version>0909dc1972</version>
+            <version>fd3f56f015</version>
             <scope>provided</scope>
         </dependency>
 
@@ -184,7 +172,7 @@
         <dependency>
             <groupId>com.github.TFPatches</groupId>
             <artifactId>TF-WorldGuard</artifactId>
-            <version>50fd4cb470</version>
+            <version>bb12813214</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
index f1af32b0..5e70f9c3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java
@@ -31,7 +31,6 @@ public class EntityWiper extends FreedomService
     @Override
     protected void onStart()
     {
-        BLACKLIST.addAll(Groups.MOB_TYPES);
         // Continuous Entity Wiper
         wiper = new BukkitRunnable()
         {
@@ -46,7 +45,6 @@ public class EntityWiper extends FreedomService
     @Override
     protected void onStop()
     {
-        BLACKLIST.removeAll(Groups.MOB_TYPES);
         wiper.cancel();
         wiper = null;
     }
@@ -60,7 +58,7 @@ public class EntityWiper extends FreedomService
         {
             for (Entity entity : world.getEntities())
             {
-                if (!BLACKLIST.contains(entity.getType()))
+                if (!BLACKLIST.contains(entity.getType()) && !Groups.MOB_TYPES.contains(entity.getType()))
                 {
                     entity.remove();
                     removed++;