diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java
index 8073db71a50..aac9cd8ab3c 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactory.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactory.java
@@ -18,14 +18,9 @@
 package forge.game.card;
 
 import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import forge.ImageKeys;
 import forge.StaticData;
 import forge.card.*;
-import forge.card.CardType.CoreType;
 import forge.card.mana.ManaCost;
 import forge.game.Game;
 import forge.game.ability.AbilityFactory;
@@ -291,7 +286,6 @@ public class CardFactory {
     }
 
     private static void buildAbilities(final Card card) {
-        final String cardName = card.getName();
 
         for (final CardStateName state : card.getStates()) {
             if (card.isDoubleFaced() && state == CardStateName.FaceDown) {
diff --git a/forge-game/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java
index 92ce3473d98..bb374662432 100644
--- a/forge-game/src/main/java/forge/game/card/CardPredicates.java
+++ b/forge-game/src/main/java/forge/game/card/CardPredicates.java
@@ -21,13 +21,11 @@ import java.util.Comparator;
 
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
 
 import forge.game.combat.CombatUtil;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.util.collect.FCollectionView;
-import forge.util.PredicateString;
 
 
 /**
@@ -87,7 +85,8 @@ public final class CardPredicates {
         return new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                return Iterables.any(c.getKeywords(), PredicateString.contains(keyword));
+                return c.hasStartOfKeyword(keyword);
+                //return Iterables.any(c.getKeywords(), PredicateString.contains(keyword));
             }
         };
     }