diff --git a/src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java b/src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java
index 14cce15e..3ee8d134 100644
--- a/src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java
+++ b/src/main/java/com/massivecraft/factions/util/AutoLeaveProcessTask.java
@@ -2,6 +2,7 @@ package com.massivecraft.factions.util;
 
 import com.massivecraft.factions.*;
 import com.massivecraft.factions.struct.Role;
+
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.util.ArrayList;
@@ -15,7 +16,7 @@ public class AutoLeaveProcessTask extends BukkitRunnable {
     private transient double toleranceMillis;
 
     public AutoLeaveProcessTask() {
-        ArrayList<FPlayer> fplayers = new ArrayList<FPlayer>(FPlayers.getInstance().getAllFPlayers());
+        ArrayList<FPlayer> fplayers = (ArrayList<FPlayer>) FPlayers.getInstance().getAllFPlayers();
         this.iterator = fplayers.listIterator();
         this.toleranceMillis = Conf.autoLeaveAfterDaysOfInactivity * 24 * 60 * 60 * 1000;
         this.readyToGo = true;
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFPlayer.java
index 6b642103..71d451d2 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/json/JSONFPlayer.java
@@ -1,32 +1,28 @@
 package com.massivecraft.factions.zcore.persist.json;
 
 import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.zcore.persist.MemoryFPlayer;
 
 public class JSONFPlayer extends MemoryFPlayer {
-    private transient boolean remove = false;
 
     public JSONFPlayer(MemoryFPlayer arg0) {
         super(arg0);
     }
 
-    public JSONFPlayer() {
-        remove = false;
-    }
-
     public JSONFPlayer(String id) {
         super(id);
     }
 
     @Override
     public void remove() {
-        remove = true;
+        ((JSONFPlayers) FPlayers.getInstance()).fPlayers.remove(getId());
     }
 
     public boolean shouldBeSaved() {
         if (!this.hasFaction() && (this.getPowerRounded() == this.getPowerMaxRounded() || this.getPowerRounded() == (int) Math.round(Conf.powerPlayerStarting))) {
             return false;
         }
-        return !remove;
+        return true;
     }
 }