diff --git a/res/cardsfolder/a/arcane_melee.txt b/res/cardsfolder/a/arcane_melee.txt
index f8a473d10f1..841be47b1b3 100644
--- a/res/cardsfolder/a/arcane_melee.txt
+++ b/res/cardsfolder/a/arcane_melee.txt
@@ -2,7 +2,7 @@ Name:Arcane Melee
 ManaCost:4 U
 Types:Enchantment
 Text:no text
-K:CostChange:All:Less:2:Spell:All:Instant/Sorcery:OnlyOneBonus:Instant and sorcery spells cost 2 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Amount$ 2 | Description$ Instant and sorcery spells cost 2 less to cast.
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arcane_melee.jpg
diff --git a/res/cardsfolder/b/ballyrush_banneret.txt b/res/cardsfolder/b/ballyrush_banneret.txt
index f4f16f828f5..94a4b184080 100644
--- a/res/cardsfolder/b/ballyrush_banneret.txt
+++ b/res/cardsfolder/b/ballyrush_banneret.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Kithkin Soldier
 Text:no text
 PT:2/1
-K:CostChange:Player:Less:1:Spell:All:Kithkin/Soldier:OnlyOneBonus:Kithkin spells and Soldier spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Kithkin,Soldier | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Kithkin spells and Soldier spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ballyrush_banneret.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/1.jpg
diff --git a/res/cardsfolder/b/bosk_banneret.txt b/res/cardsfolder/b/bosk_banneret.txt
index f0fa52472d0..7cc34138c12 100644
--- a/res/cardsfolder/b/bosk_banneret.txt
+++ b/res/cardsfolder/b/bosk_banneret.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Treefolk Shaman
 Text:no text
 PT:1/3
-K:CostChange:Player:Less:1:Spell:All:Treefolk/Shaman:OnlyOneBonus:Treefolk spells and Shaman spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Treefolk,Shaman | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Treefolk spells and Shaman spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bosk_banneret.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/114.jpg
diff --git a/res/cardsfolder/b/brighthearth_banneret.txt b/res/cardsfolder/b/brighthearth_banneret.txt
index 5693c82dd08..0d882c6d146 100644
--- a/res/cardsfolder/b/brighthearth_banneret.txt
+++ b/res/cardsfolder/b/brighthearth_banneret.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Elemental Warrior
 Text:no text
 PT:1/1
-K:CostChange:Player:Less:1:Spell:All:Elemental/Warrior:OnlyOneBonus:Elemental spells and Warrior spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Elemental,Warrior | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Elemental spells and Warrior spells you cast cost 1 less to cast.
 A:AB$ PutCounter | Cost$ 1 R Discard<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | ActivationZone$ Hand | CounterNum$ 1 | PrecostDesc$ Reinforce 1 - | SpellDescription$ Put a +1/+1 counter on target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brighthearth_banneret.jpg
diff --git a/res/cardsfolder/f/frogtosser_banneret.txt b/res/cardsfolder/f/frogtosser_banneret.txt
index 74bff2a5cad..5c707866b95 100644
--- a/res/cardsfolder/f/frogtosser_banneret.txt
+++ b/res/cardsfolder/f/frogtosser_banneret.txt
@@ -4,7 +4,7 @@ Types:Creature Goblin Rogue
 Text:no text
 PT:1/1
 K:Haste
-K:CostChange:Player:Less:1:Spell:All:Goblin/Rogue:OnlyOneBonus:Goblin spells and Rogue spells you cast cost 1 less to cast.
+S:Mode$ ReduceCost | ValidCard$ Goblin,Rogue | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Goblin spells and Rogue spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frogtosser_banneret.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/64.jpg
diff --git a/res/cardsfolder/s/stonybrook_banneret.txt b/res/cardsfolder/s/stonybrook_banneret.txt
index e96342e0e62..8c86c87519f 100644
--- a/res/cardsfolder/s/stonybrook_banneret.txt
+++ b/res/cardsfolder/s/stonybrook_banneret.txt
@@ -4,8 +4,7 @@ Types:Creature Merfolk Wizard
 Text:no text
 PT:1/1
 K:Islandwalk
-K:CostChange:Player:Less:1:Spell:All:Merfolk/Wizard:OnlyOneBonus:Merfolk spells and Wizard spells you cast cost 1 less to cast.
-SVar:RemRandomDeck:True
+S:Mode$ ReduceCost | ValidCard$ Merfolk,Wizard | Type$ Spell | Activator$ You | Amount$ 1 | Description$ Merfolk spells and Wizard spells you cast cost 1 less to cast.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stonybrook_banneret.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/51.jpg
diff --git a/src/main/java/forge/GameAction.java b/src/main/java/forge/GameAction.java
index 2171a61e6c3..d7e2b694753 100644
--- a/src/main/java/forge/GameAction.java
+++ b/src/main/java/forge/GameAction.java
@@ -2131,11 +2131,6 @@ public class GameAction {
                                 k[3] = "0";
                             }
                         }
-                        if (k[7].contains("TargetInPlay")) {
-                            if (!playerPlay.contains(originalCard)) {
-                                k[3] = "0";
-                            }
-                        }
                         if (k[7].contains("TargetInHand")) {
                             if (!playerHand.contains(originalCard)) {
                                 k[3] = "0";
@@ -2326,11 +2321,6 @@ public class GameAction {
                                     k[3] = "0";
                                 }
                             }
-                            if (k[7].contains("TargetInPlay")) {
-                                if (!playerPlay.contains(originalCard)) {
-                                    k[3] = "0";
-                                }
-                            }
                             if (k[7].contains("TargetInHand")) {
                                 if (!playerHand.contains(originalCard)) {
                                     k[3] = "0";
diff --git a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
index 1e93fa90b78..eb50463aa3a 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
@@ -106,7 +106,7 @@ public class StaticAbilityCostChange {
         if (params.containsKey("Type") && params.get("Type").equals("Ability") && !sa.isAbility()) {
             return originalCost;
         }
-        if (params.containsKey("AffectedZone") && !card.isInZone(ZoneType.smartValueOf("AffectedZone"))) {
+        if (params.containsKey("AffectedZone") && !card.isInZone(ZoneType.smartValueOf(params.get("AffectedZone")))) {
             return originalCost;
         }