diff --git a/src/main/java/forge/card/ability/effects/AbandonEffect.java b/src/main/java/forge/card/ability/effects/AbandonEffect.java
index 4370a0b28b6..ea6735d3be3 100644
--- a/src/main/java/forge/card/ability/effects/AbandonEffect.java
+++ b/src/main/java/forge/card/ability/effects/AbandonEffect.java
@@ -25,7 +25,7 @@ public class AbandonEffect extends SpellAbilityEffect {
         controller.getZone(ZoneType.Command).remove(source);
         game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
 
-        controller.getSchemeDeck().add(source);
+        controller.getZone(ZoneType.SchemeDeck).add(source);
     }
 
 }
diff --git a/src/main/java/forge/game/GameState.java b/src/main/java/forge/game/GameState.java
index fa502f5d14a..1a5cfeaf298 100644
--- a/src/main/java/forge/game/GameState.java
+++ b/src/main/java/forge/game/GameState.java
@@ -599,7 +599,7 @@ public class GameState {
                     i--;
                     getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
 
-                    c.getController().getSchemeDeck().add(c);
+                    c.getController().getZone(ZoneType.SchemeDeck).add(c);
                 }
             }
 
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 03c9a0d24b8..42f6980ded8 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -159,14 +159,12 @@ public class Player extends GameEntity implements Comparable<Player> {
     /** The zones. */
     private final Map<ZoneType, PlayerZone> zones = new EnumMap<ZoneType, PlayerZone>(ZoneType.class);
 
-    private List<Card> planarDeck = new ArrayList<Card>();
     private Card currentPlane = null;
 
     private PlayerStatistics stats = new PlayerStatistics();
     protected PlayerController controller;
     private final LobbyPlayer lobbyPlayer;
     
-    private final List<Card> schemeDeck = new ArrayList<Card>();
     private Card activeScheme = null;
 
     /** The Constant ALL_ZONES. */
@@ -221,26 +219,10 @@ public class Player extends GameEntity implements Comparable<Player> {
         return getLobbyPlayer().getType();
     }
 
-    public List<Card> getSchemeDeck() {
-
-        return schemeDeck;
-    }
-
-    public void setSchemeDeck(Iterable<Card> sd) {
-
-        schemeDeck.clear();
-        for (Card c : sd) {
-
-            schemeDeck.add(c);
-            c.setOwner(this);
-        }
-        CardLists.shuffle(schemeDeck);
-    }
-
     public boolean isArchenemy() {
 
         //Only the archenemy has schemes.
-        return schemeDeck.size() > 0;
+        return getZone(ZoneType.SchemeDeck).size() > 0;
     }
 
     public void setSchemeInMotion() {
@@ -261,9 +243,9 @@ public class Player extends GameEntity implements Comparable<Player> {
 
         game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
 
-        activeScheme = schemeDeck.get(0);
+        activeScheme = getZone(ZoneType.SchemeDeck).get(0);
 
-        schemeDeck.remove(0);
+        getZone(ZoneType.SchemeDeck).remove(activeScheme);
 
         this.getZone(ZoneType.Command).add(activeScheme);