diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java
index 0dd90d21afe..62b2fb03128 100644
--- a/src/main/java/forge/AllZoneUtil.java
+++ b/src/main/java/forge/AllZoneUtil.java
@@ -33,22 +33,6 @@ public final class AllZoneUtil {
         return creats.filter(CardListFilter.creatures);
     }
 
-    /**
-     * use to get a list of creatures in play with a given keyword.
-     *
-     * @param keyword the keyword to get creatures for
-     * @return a CardList containing all creatures in play with a given keyword
-     */
-    public static CardList getCreaturesInPlayWithKeyword(final String keyword) {
-        CardList list = getCreaturesInPlay();
-        list = list.filter(new CardListFilter() {
-            public boolean addCard(final Card c) {
-                return c.hasKeyword(keyword);
-            }
-        });
-        return list;
-    }
-
     
     /**
      * gets a list of all cards of a certain type that a given player has in given zone.
@@ -70,8 +54,12 @@ public final class AllZoneUtil {
      */
     public static CardList getCardsIn(final Constant.Zone zone) {
         CardList cards = new CardList();
-        for (Player p : Singletons.getModel().getGameState().getPlayers()) {
-            cards.addAll(p.getZone(zone).getCards());    
+        if ( zone == Zone.Stack) {
+            cards.addAll(AllZone.getStackZone().getCards());
+        } else {
+            for (Player p : AllZone.getPlayersInGame()) {
+                cards.addAll(p.getZone(zone).getCards());
+            }
         }
         return cards;
     }
@@ -386,8 +374,9 @@ public final class AllZoneUtil {
      */
     public static CardList getCardsInGame() {
         CardList all = new CardList();
-        getCardsInGame(AllZone.getHumanPlayer(), all);
-        getCardsInGame(AllZone.getComputerPlayer(), all);
+        for (Player p : AllZone.getPlayersInGame()) {
+            getCardsInGame(p, all);
+        }
         return all;
     }
 
@@ -396,7 +385,7 @@ public final class AllZoneUtil {
         CardList all = toAdd == null ? new CardList() : toAdd;
         all.addAll(player.getZone(Zone.Graveyard).getCards());
         all.addAll(player.getZone(Zone.Hand).getCards());
-        all.addAll(player.getZone(Zone.Library).getCards());
+        all.addAll(player.getZone(Zone.Library).getCards()); // not sure if library should be included.
         all.addAll(player.getZone(Zone.Battlefield).getCards());
         all.addAll(player.getZone(Zone.Exile).getCards());
         //should this include Human_Command ?
diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java
index ec2bfbe2bb7..0e83d73695f 100644
--- a/src/main/java/forge/Upkeep.java
+++ b/src/main/java/forge/Upkeep.java
@@ -538,8 +538,7 @@ public class Upkeep implements java.io.Serializable {
      * @return a {@link forge.CardList} object.
      */
     private static CardList abyss_getTargets(final Player player, final Card card) {
-        CardList creats = AllZoneUtil.getCreaturesInPlay(player);
-        creats = creats.filter(CardListFilter.nonartifacts);
+        CardList creats = AllZoneUtil.getCreaturesInPlay(player).filter(CardListFilter.nonartifacts);
         creats = creats.getTargetableCards(card);
         return creats;
     }
@@ -561,8 +560,7 @@ public class Upkeep implements java.io.Serializable {
             final Ability sacrificeArtifact = new Ability(c, "") {
                 @Override
                 public void resolve() {
-                    CardList artifacts = player.getCardsIn(Zone.Battlefield);
-                    artifacts = artifacts.filter(CardListFilter.artifacts);
+                    CardList artifacts = player.getCardsIn(Zone.Battlefield).filter(CardListFilter.artifacts);
 
                     if (player.isHuman()) {
                         AllZone.getInputControl().setInput(new Input() {