diff --git a/src/main/java/com/massivecraft/factions/Faction.java b/src/main/java/com/massivecraft/factions/Faction.java
index de171488..11ff53e0 100644
--- a/src/main/java/com/massivecraft/factions/Faction.java
+++ b/src/main/java/com/massivecraft/factions/Faction.java
@@ -25,8 +25,6 @@ public interface Faction extends EconomyParticipator {
 
     public boolean removeWarp(String name);
 
-    public boolean removeWarp(LazyLocation loc);
-
     public void clearWarps();
 
     public void addAnnouncement(FPlayer fPlayer, String msg);
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
index d392c304..e476d6f8 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
@@ -47,9 +47,10 @@ public abstract class MemoryBoard extends Board {
 
     public void removeAt(FLocation flocation) {
         Faction faction = getFactionAt(flocation);
-        for (LazyLocation loc : faction.getWarps().values()) {
-            if (flocation.isInChunk(loc.getLocation())) {
-                faction.removeWarp(loc);
+        Iterator<LazyLocation> it = faction.getWarps().values().iterator();
+        while (it.hasNext()) {
+            if (flocation.isInChunk(it.next().getLocation())) {
+                it.remove();
             }
         }
         clearOwnershipAt(flocation);
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
index a9298cc8..90bcee3f 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
@@ -86,19 +86,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
     }
 
     public boolean removeWarp(String name) {
-        if (warps.containsKey(name)) {
-            warps.remove(name);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean removeWarp(LazyLocation loc) {
-        if (warps.containsValue(loc)) {
-            warps.remove(loc);
-            return true;
-        }
-        return false;
+        return warps.remove(name) != null;
     }
 
     public void clearWarps() {