diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
index dd0021894..5da77f917 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
@@ -2,8 +2,10 @@ package com.intellectualcrafters.plot;
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
+import java.util.Map.Entry;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -78,6 +80,7 @@ import com.intellectualcrafters.plot.commands.list;
 import com.intellectualcrafters.plot.commands.plugin;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.database.plotme.ClassicPlotMeConnector;
 import com.intellectualcrafters.plot.database.plotme.LikePlotMeConverter;
 import com.intellectualcrafters.plot.flag.FlagManager;
@@ -97,6 +100,8 @@ import com.intellectualcrafters.plot.listeners.TNTListener;
 import com.intellectualcrafters.plot.listeners.WorldEvents;
 import com.intellectualcrafters.plot.listeners.worldedit.WEListener;
 import com.intellectualcrafters.plot.listeners.worldedit.WESubscriber;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.titles.AbstractTitle;
 import com.intellectualcrafters.plot.titles.DefaultTitle;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
index dd71fd130..be8219a80 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotSquared.java
@@ -130,6 +130,11 @@ public class PlotSquared {
         plotmanagers.remove(world);
         plotworlds.remove(world);
     }
+    
+    public static void removePlotWorldAbs(final String world) {
+        plotmanagers.remove(world);
+        plotworlds.remove(world);
+    }
 
     public static HashMap<String, HashMap<PlotId, Plot>> getAllPlotsRaw() {
         return plots;
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java
index c8612be3f..f71933939 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/bukkit/SetGenCB.java
@@ -16,7 +16,7 @@ import com.intellectualcrafters.plot.util.SetupUtils;
 public class SetGenCB {
     public static void setGenerator(World world) throws Exception {
         SetupUtils.manager.updateGenerators();
-        PlotSquared.removePlotWorld(world.getName());
+        PlotSquared.removePlotWorldAbs(world.getName());
         ChunkGenerator gen = world.getGenerator();
         if (gen == null) {
             return;