diff --git a/res/cardsfolder/h/herald_of_war.txt b/res/cardsfolder/h/herald_of_war.txt
index fe5e085090a..86390f320eb 100644
--- a/res/cardsfolder/h/herald_of_war.txt
+++ b/res/cardsfolder/h/herald_of_war.txt
@@ -6,7 +6,7 @@ PT:3/3
 K:Flying
 T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ HeraldsWarCry | TriggerDescription$ Whenever CARDNAME attacks, put a +1/+1 counter on it.
 SVar:HeraldsWarCry:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-K:CostChange:Player:Less:X:Spell:All:Angel/Human:OnlyOneBonus:Angels and Humans you cast cost 1 less for each +1/+1 counter on CARDNAME.
+S:Mode$ ReduceCost | ValidCard$ Angel,Human | Type$ Spell | Activator$ You | Amount$ X | Description$ Angels and Humans you cast cost 1 less for each +1/+1 counter on CARDNAME.
 SVar:X:Count$NumCounters.P1P1
 SVar:HasAttackEffect:TRUE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/n/nightscape_familiar.txt b/res/cardsfolder/n/nightscape_familiar.txt
index 1c89c62d294..83095d64372 100644
--- a/res/cardsfolder/n/nightscape_familiar.txt
+++ b/res/cardsfolder/n/nightscape_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:1/1
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
-K:CostChange:Player:Less:1:Spell:blue/red:All:OnlyOneBonus:Blue spells and red spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Card.Blue,Card.Red | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Blue spells and red spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightscape_familiar.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/48.jpg
diff --git a/res/cardsfolder/s/stormscape_familiar.txt b/res/cardsfolder/s/stormscape_familiar.txt
index a3763364814..df5f6fc1461 100644
--- a/res/cardsfolder/s/stormscape_familiar.txt
+++ b/res/cardsfolder/s/stormscape_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Bird
 Text:no text
 PT:1/1
 K:Flying
-K:CostChange:Player:Less:1:Spell:white/black:All:OnlyOneBonus:White spells and black spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Card.White,Card.Black | Type$ Spell | Activator$ You | Amount$ 1 | Description$ White spells and black spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormscape_familiar.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/32.jpg
diff --git a/res/cardsfolder/s/sunscape_familiar.txt b/res/cardsfolder/s/sunscape_familiar.txt
index 3e7e7de53b6..02de689cacf 100644
--- a/res/cardsfolder/s/sunscape_familiar.txt
+++ b/res/cardsfolder/s/sunscape_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Wall
 Text:no text
 PT:0/3
 K:Defender
-K:CostChange:Player:Less:1:Spell:green/blue:All:OnlyOneBonus:Green spells and blue spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Card.Blue,Card.Green | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Green spells and blue spells you cast cost 1 less to cast.
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunscape_familiar.jpg
diff --git a/res/cardsfolder/t/thornscape_familiar.txt b/res/cardsfolder/t/thornscape_familiar.txt
index 3d557981e87..63deb257cd2 100644
--- a/res/cardsfolder/t/thornscape_familiar.txt
+++ b/res/cardsfolder/t/thornscape_familiar.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Insect
 Text:no text
 PT:2/1
-K:CostChange:Player:Less:1:Spell:red/white:All:OnlyOneBonus:Red spells and white spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Card.White,Card.Red | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Red spells and white spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thornscape_familiar.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/95.jpg
diff --git a/res/cardsfolder/t/thunderscape_familiar.txt b/res/cardsfolder/t/thunderscape_familiar.txt
index 7aa33561df7..f87345c3d4f 100644
--- a/res/cardsfolder/t/thunderscape_familiar.txt
+++ b/res/cardsfolder/t/thunderscape_familiar.txt
@@ -4,7 +4,7 @@ Types:Creature Kavu
 Text:no text
 PT:1/1
 K:First Strike
-K:CostChange:Player:Less:1:Spell:black/green:All:OnlyOneBonus:Black spells and green spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Card.Black,Card.Green | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Black spells and green spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderscape_familiar.jpg
 SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/76.jpg
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 69ca6361386..cffbdab5f23 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -2017,7 +2017,7 @@ public class GameAction {
                 return false;
             }
         });
-        final CardList playerHand = controller.getCardsIn(ZoneType.Hand);
+
         int xBonus = 0;
         final int max = 25;
         if (sa.isMultiKicker()) {
@@ -2067,36 +2067,6 @@ public class GameAction {
                             }
                         }
                     }
-                    if (k[7].contains("All Conditions")) { // Only Works for
-                                                           // Color and Type
-                        for (int stringNo = 5; stringNo < 7; stringNo++) {
-                            final String spilt = k[stringNo];
-                            final String[] colorSpilt = spilt.split("/");
-                            for (final String element : colorSpilt) {
-                                k[stringNo] = element;
-                                if (stringNo == 5) {
-                                    if (CardUtil.getColors(originalCard).contains(k[5]) || k[5].equals("All")) {
-                                    } else {
-                                        k[5] = "Nullified";
-                                        break;
-                                    }
-                                }
-                                if (stringNo == 6) {
-                                    if (originalCard.isType(k[6]) || k[6].equals("All")) {
-                                    } else {
-                                        k[6] = "Nullified";
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        if (!k[5].equals("Nullified")) {
-                            k[5] = "All";
-                        }
-                        if (!k[6].equals("Nullified")) {
-                            k[6] = "All";
-                        }
-                    }
                     if (((k[1].equals("Player") && card.getController().equals(controller))
                             || (k[1].equals("Opponent") && card.getController().equals(controller.getOpponent())) || k[1]
                                 .equals("All"))
@@ -2227,53 +2197,6 @@ public class GameAction {
                         k[6] = card.getChosenType();
                     }
                     if (k[2].equals("Less")) {
-                        if (k[7].equals("OnlyOneBonus")) { // Only Works for
-                                                           // Color and Type
-                            for (int stringNo = 5; stringNo < 7; stringNo++) {
-                                final String spilt = k[stringNo];
-                                final String[] colorSpilt = spilt.split("/");
-
-                                for (final String element : colorSpilt) {
-                                    k[stringNo] = element;
-                                    if ((stringNo == 5) && CardUtil.getColors(originalCard).contains(k[5])) {
-                                        break;
-                                    }
-                                    if ((stringNo == 6) && (originalCard.isType(k[6]))) {
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-                        if (k[7].contains("All Conditions")) { // Only Works for
-                                                               // Color and Type
-                            for (int stringNo = 5; stringNo < 7; stringNo++) {
-                                final String spilt = k[stringNo];
-                                final String[] colorSpilt = spilt.split("/");
-                                for (final String element : colorSpilt) {
-                                    k[stringNo] = element;
-                                    if (stringNo == 5) {
-                                        if (CardUtil.getColors(originalCard).contains(k[5]) || k[5].equals("All")) {
-                                        } else {
-                                            k[5] = "Nullified";
-                                            break;
-                                        }
-                                    }
-                                    if (stringNo == 6) {
-                                        if (originalCard.isType(k[6]) || k[6].equals("All")) {
-                                        } else {
-                                            k[6] = "Nullified";
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                            if (!k[5].equals("Nullified")) {
-                                k[5] = "All";
-                            }
-                            if (!k[6].equals("Nullified")) {
-                                k[6] = "All";
-                            }
-                        }
                         if (((k[1].equals("Player") && card.getController().equals(controller))
                                 || (k[1].equals("Opponent") && card.getController().equals(controller.getOpponent())) || k[1]
                                     .equals("All"))