refactor: SimpleActivatedAbility default zone (separate lines)

Mage.Sets/src/mage/cards/a/AdantoVanguard.java

@@ -41,7 +41,6 @@ public final class AdantoVanguard extends CardImpl {
 
         // Pay 4 life: Adanto Vanguard gains indestructible until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn),
                 new PayLifeCost(4)
         ));

Mage.Sets/src/mage/cards/a/ArcaneEncyclopedia.java

@@ -22,7 +22,6 @@ public final class ArcaneEncyclopedia extends CardImpl {
 
         // {3}, {T}: Draw a card.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(1),
                 new GenericManaCost(3)
         );

Mage.Sets/src/mage/cards/b/BloodBairn.java

@@ -30,7 +30,6 @@ public final class BloodBairn extends CardImpl {
 
         // Sacrifice another creature: Blood Bairn gets +2/+2 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, 2, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)));
 

Mage.Sets/src/mage/cards/b/BloodflowConnoisseur.java

@@ -32,7 +32,6 @@ public final class BloodflowConnoisseur extends CardImpl {
         // Sacrifice a creature: Put a +1/+1 counter on Bloodflow Connoisseur.
         Cost abilityCost = new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE);
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
                 abilityCost
         );

Mage.Sets/src/mage/cards/b/BomatCourier.java

@@ -38,7 +38,6 @@ public final class BomatCourier extends CardImpl {
 
         // {R}, Discard your hand, Sacrifice Bomat Courier: Put all cards exiled with Bomat Courier into their owners' hands.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ReturnFromExileForSourceEffect(Zone.HAND).withText(true, true, true),
                 new ColoredManaCost(ColoredManaSymbol.R));
         ability.addCost(new DiscardHandCost());

Mage.Sets/src/mage/cards/b/BorosChallenger.java

@@ -32,7 +32,6 @@ public final class BorosChallenger extends CardImpl {
 
         // {2}{R}{W}: Boros Challenger gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1, 1, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{2}{R}{W}")
         ));

Mage.Sets/src/mage/cards/b/BountyAgent.java

@@ -48,7 +48,6 @@ public final class BountyAgent extends CardImpl {
 
         // {T}, Sacrifice Bounty Agent: Destroy target legendary permanent that's an artifact, creature, or enchantment.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DestroyTargetEffect(),
                 new TapSourceCost()
         );

Mage.Sets/src/mage/cards/b/BreyaEtheriumShaper.java

@@ -43,7 +43,6 @@ public final class BreyaEtheriumShaper extends CardImpl {
 
         // {2}, Sacrifice two artifacts: Choose one — Breya deals 3 damage to target player or planeswalker.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(3),
                 new GenericManaCost(2));
         ability.addCost(new SacrificeTargetCost(2, StaticFilters.FILTER_PERMANENT_ARTIFACTS));

Mage.Sets/src/mage/cards/b/Brightling.java

@@ -39,7 +39,6 @@ public final class Brightling extends CardImpl {
 
         // {W}: Brightling gains vigilance until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         VigilanceAbility.getInstance(),
                         Duration.EndOfTurn
@@ -49,7 +48,6 @@ public final class Brightling extends CardImpl {
 
         // {W}: Brightling gains lifelink until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         LifelinkAbility.getInstance(),
                         Duration.EndOfTurn
@@ -59,14 +57,12 @@ public final class Brightling extends CardImpl {
 
         // {W}: Return Brightling to its owner's hand.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ReturnToHandSourceEffect(true),
                 new ColoredManaCost(ColoredManaSymbol.W)
         ));
 
         // {1}: Brightling gets +1/-1 or -1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BrightlingEffect(),
                 new GenericManaCost(1)
         ));

Mage.Sets/src/mage/cards/b/BudokaPupil.java

@@ -75,7 +75,6 @@ class IchigaWhoTopplesOaks extends TokenImpl {
 
         // Remove a ki counter from Ichiga, Who Topples Oaks: Target creature gets +2/+2 until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostTargetEffect(2, 2, Duration.EndOfTurn),
                 new RemoveCountersSourceCost(CounterType.KI.createInstance()));
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/b/BurnishedHart.java

@@ -32,7 +32,6 @@ public final class BurnishedHart extends CardImpl {
 
         // {3}, Sacrifice Burnished Hart: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true),
                 new GenericManaCost(3));
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/c/CallowJushi.java

@@ -75,7 +75,6 @@ class JarakuTheInterloper extends TokenImpl {
 
         // Remove a ki counter from Jaraku the Interloper: Counter target spell unless its controller pays {2}.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CounterUnlessPaysEffect(new GenericManaCost(2)),
                 new RemoveCountersSourceCost(CounterType.KI.createInstance()));
         ability.addTarget(new TargetSpell());

Mage.Sets/src/mage/cards/c/CarnifexDemon.java

@@ -47,7 +47,6 @@ public final class CarnifexDemon extends CardImpl {
         ));
 
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersAllEffect(
                         CounterType.M1M1.createInstance(),
                         filter

Mage.Sets/src/mage/cards/c/CharnelTroll.java

@@ -53,7 +53,6 @@ public final class CharnelTroll extends CardImpl {
 
         // {B}{G}, Discard a creature card: Put a +1/+1 counter on Morgue Troll.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
                 new ManaCostsImpl<>("{B}{G}")
         );

Mage.Sets/src/mage/cards/c/CoilsOfTheMedusa.java

@@ -42,7 +42,6 @@ public final class CoilsOfTheMedusa extends CardImpl {
 
         // Sacrifice Coils of the Medusa: Destroy all non-Wall creatures blocking enchanted creature.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CoilsOfTheMedusaDestroyEffect(),
                 new SacrificeSourceCost())
         );

Mage.Sets/src/mage/cards/c/CopperGnomes.java

@@ -29,7 +29,6 @@ public final class CopperGnomes extends CardImpl {
 
         // {4}, Sacrifice Copper Gnomes: You may put an artifact card from your hand onto the battlefield.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_ARTIFACT_AN),
                 new ManaCostsImpl<>("{4}")
         );

Mage.Sets/src/mage/cards/c/CorpseBlockade.java

@@ -35,7 +35,6 @@ public final class CorpseBlockade extends CardImpl {
 
         // Sacrifice another creature: Corpse Blockade gains deathtouch until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)));
     }

Mage.Sets/src/mage/cards/c/CunningBandit.java

@@ -75,7 +75,6 @@ class AzamukiTreacheryIncarnate extends TokenImpl {
 
         // Remove a ki counter from Azamuki, Treachery Incarnate: Gain control of target creature until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainControlTargetEffect(Duration.EndOfTurn),
                 new RemoveCountersSourceCost(CounterType.KI.createInstance()));
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/d/DailyRegimen.java

@@ -37,7 +37,6 @@ public final class DailyRegimen extends CardImpl {
         this.addAbility(ability);
         // {1}{W}: Put a +1/+1 counter on enchanted creature.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersAttachedEffect(CounterType.P1P1.createInstance(),"enchanted creature"),
                 new ManaCostsImpl<>("{1}{W}")));
     }

Mage.Sets/src/mage/cards/d/DawnOfHope.java

@@ -32,7 +32,6 @@ public final class DawnOfHope extends CardImpl {
 
         // {3}{W}: Create a 1/1 white Soldier creature token with lifelink.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SoldierLifelinkToken()),
                 new ManaCostsImpl<>("{3}{W}")
         ));

Mage.Sets/src/mage/cards/d/DevkarinDissident.java

@@ -28,7 +28,6 @@ public final class DevkarinDissident extends CardImpl {
 
         // {4}{G}: Devkarin Dissident gets +2/+2 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, 2, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{4}{G}")
         ));

Mage.Sets/src/mage/cards/d/DismissivePyromancer.java

@@ -33,7 +33,6 @@ public final class DismissivePyromancer extends CardImpl {
 
         // {R}, {T}, Discard a card: Draw a card.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(1),
                 new ManaCostsImpl<>("{R}")
         );
@@ -43,7 +42,6 @@ public final class DismissivePyromancer extends CardImpl {
 
         // {2}{R}, {T}, Sacrifice Dismissive Pyromancer: It deals 4 damage to target creature.
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(4, "it"),
                 new ManaCostsImpl<>("{2}{R}")
         );

Mage.Sets/src/mage/cards/d/DraconicDisciple.java

@@ -35,7 +35,6 @@ public final class DraconicDisciple extends CardImpl {
 
         // {7}, {T}, Sacrifice Draconic Disciple: Create a 5/5 red Dragon creature token with flying.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new DragonToken2()),
                 new GenericManaCost(7)
         );

Mage.Sets/src/mage/cards/d/DreamscapeArtist.java

@@ -37,7 +37,6 @@ public final class DreamscapeArtist extends CardImpl {
         // {2}{U}, {tap}, Discard a card, Sacrifice a land: Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
         TargetCardInLibrary target = new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS);
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(target, false),
                 new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/d/DropkickBomber.java

@@ -57,7 +57,6 @@ public final class DropkickBomber extends CardImpl {
 
         // {R}: Until end of turn, another target Goblin you control gains flying and "When this creature deals combat damage, sacrifice it."
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn)
                         .setText("Until end of turn, another target Goblin you control gains flying"),
                 new ManaCostsImpl<>("{R}")

Mage.Sets/src/mage/cards/e/ElvishClancaller.java

@@ -52,7 +52,6 @@ public final class ElvishClancaller extends CardImpl {
 
         // {4}{G}{G}, {T}: Search your library for a card named Elvish Clancaller, put it onto the battlefield, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(
                         new TargetCardInLibrary(filter2),
                         false

Mage.Sets/src/mage/cards/e/EpitaphGolem.java

@@ -28,7 +28,6 @@ public final class EpitaphGolem extends CardImpl {
 
         // {2}: Put target card from your graveyard on the bottom of your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PutOnLibraryTargetEffect(false),
                 new ManaCostsImpl<>("{2}"));
         ability.addTarget(new TargetCardInYourGraveyard());

Mage.Sets/src/mage/cards/e/EvolvingWilds.java

@@ -26,7 +26,6 @@ public final class EvolvingWilds extends CardImpl {
 
         // {T}, Sacrifice Evolving Wilds: Search your library for a basic land card and put it onto the battlefield tapped. Then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true),
                 new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/f/FaithfulSquire.java

@@ -78,7 +78,6 @@ class KaisoMemoryOfLoyaltyToken extends TokenImpl {
 
         // Remove a ki counter from Kaiso, Memory of Loyalty: Prevent all damage that would be dealt to target creature this turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PreventDamageToTargetEffect(Duration.EndOfTurn, Integer.MAX_VALUE),
                 new RemoveCountersSourceCost(CounterType.KI.createInstance()));
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/f/FiresOfMountDoom.java

@@ -49,7 +49,6 @@ public final class FiresOfMountDoom extends CardImpl {
         // {2}{R}: Exile the top card of your library. You may play that card this turn.
         // When you play a card this way, Fires of Mount Doom deals 2 damage to each player.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new FiresOfMountDoomEffect(),
                 new ManaCostsImpl<>("{2}{R}")
         ).setIdentifier(MageIdentifier.FiresOfMountDoomAlternateCast));

Mage.Sets/src/mage/cards/f/FreneticEfreet.java

@@ -34,7 +34,6 @@ public final class FreneticEfreet extends CardImpl {
 
         // {0}: Flip a coin. If you win the flip, Frenetic Efreet phases out. If you lose the flip, sacrifice Frenetic Efreet.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new FreneticEfreetEffect(),
                 new GenericManaCost(0)
         ));

Mage.Sets/src/mage/cards/f/FrilledSeaSerpent.java

@@ -28,7 +28,6 @@ public final class FrilledSeaSerpent extends CardImpl {
 
         // {5}{U}{U}: Frilled Sea Serpent can't be blocked this turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CantBeBlockedSourceEffect(Duration.EndOfTurn),
                 new ManaCostsImpl<>("{5}{U}{U}")
         ));

Mage.Sets/src/mage/cards/f/FungalPlots.java

@@ -45,7 +45,6 @@ public final class FungalPlots extends CardImpl {
 
         // Sacrifice two Saprolings: You gain 2 life and draw a card.
         SimpleActivatedAbility ability2 = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainLifeEffect(2),
                 new SacrificeTargetCost(2, filter2)
         );

Mage.Sets/src/mage/cards/g/GargoyleCastle.java

@@ -28,7 +28,6 @@ public final class GargoyleCastle extends CardImpl {
         this.addAbility(new ColorlessManaAbility());
         // {T}, {5}, Sacrifice Gargoyle Castle: Put a 3/4 colorless Gargoyle artifact creature token with flying onto the battlefield.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new GargoyleToken()),
                 new ManaCostsImpl<>("{5}"));
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/g/GeneralTazri.java

@@ -48,7 +48,6 @@ public final class GeneralTazri extends CardImpl {
         DynamicValue xValue = new GeneralTazriColorCount();
         BoostControlledEffect effect = new BoostControlledEffect(xValue, xValue, Duration.EndOfTurn, new FilterCreaturePermanent(SubType.ALLY, "Ally creatures"), false);
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 effect,
                 new ManaCostsImpl<>("{W}{U}{B}{R}{G}")));
 

Mage.Sets/src/mage/cards/g/GhostCouncilOfOrzhova.java

@@ -42,7 +42,6 @@ public final class GhostCouncilOfOrzhova extends CardImpl {
 
         // {1}, Sacrifice a creature: Exile Ghost Council of Orzhova. Return it to the battlefield under its owner's control at the beginning of the next end step.
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileReturnBattlefieldOwnerNextEndStepSourceEffect(),
                 new GenericManaCost(1));
         ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));

Mage.Sets/src/mage/cards/g/Gnathosaur.java

@@ -36,7 +36,6 @@ public final class Gnathosaur extends CardImpl {
         this.toughness = new MageInt(4);
 
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn),
                 new SacrificeTargetCost(filter)));
     }

Mage.Sets/src/mage/cards/g/GoblinBanneret.java

@@ -32,7 +32,6 @@ public final class GoblinBanneret extends CardImpl {
 
         // {1}{R}: Goblin Banneret gets +2/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, 0, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{1}{R}")
         ));

Mage.Sets/src/mage/cards/g/GoblinBomb.java

@@ -36,7 +36,6 @@ public final class GoblinBomb extends CardImpl {
 
         // Remove five fuse counters from Goblin Bomb, Sacrifice Goblin Bomb: Goblin Bomb deals 20 damage to target player.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(20),
                 new RemoveCountersSourceCost(CounterType.FUSE.createInstance(5))
         );

Mage.Sets/src/mage/cards/g/GoblinMotivator.java

@@ -32,7 +32,6 @@ public final class GoblinMotivator extends CardImpl {
 
         // {T}: Target creature gains haste until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(
                         HasteAbility.getInstance(),
                         Duration.EndOfTurn

Mage.Sets/src/mage/cards/g/GontisMachinations.java

@@ -34,7 +34,6 @@ public final class GontisMachinations extends CardImpl {
 
         // Pay {E}{E}, Sacrifice Gonti's Machinations: Each opponent loses 3 life. You gain life equal to the life lost this way.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new LoseLifeOpponentsYouGainLifeLostEffect(3),
                 new PayEnergyCost(2));
         ability.addCost(new SacrificeSourceCost());

Mage.Sets/src/mage/cards/g/GrapplingSundew.java

@@ -36,7 +36,6 @@ public final class GrapplingSundew extends CardImpl {
 
         // {4}{G}: Grappling Sundew gains indestructible until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         IndestructibleAbility.getInstance(),
                         Duration.EndOfTurn

Mage.Sets/src/mage/cards/g/Gravewaker.java

@@ -34,7 +34,6 @@ public final class Gravewaker extends CardImpl {
 
         // {5}{B}{B}: Return target creature card from your graveyard to the battlefield tapped.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ReturnFromGraveyardToBattlefieldTargetEffect(true)
                         .setText("return target creature card from your graveyard to the battlefield tapped"),
                 new ManaCostsImpl<>("{5}{B}{B}")

Mage.Sets/src/mage/cards/g/GraveyardMarshal.java

@@ -35,7 +35,6 @@ public final class GraveyardMarshal extends CardImpl {
 
         // {2}{B}, Exile a creature card from your graveyard: Create a tapped 2/2 black Zombie creature token.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(
                         new ZombieToken(),
                         1, true, false

Mage.Sets/src/mage/cards/h/Hackrobat.java

@@ -32,7 +32,6 @@ public final class Hackrobat extends CardImpl {
 
         // {B}: Hackrobat gains deathtouch until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         DeathtouchAbility.getInstance(),
                         Duration.EndOfTurn
@@ -41,7 +40,6 @@ public final class Hackrobat extends CardImpl {
 
         // {R}: Hackrobat gets +2/-2 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, -2, Duration.EndOfTurn),
                 new ColoredManaCost(ColoredManaSymbol.R)
         ));

Mage.Sets/src/mage/cards/h/Helldozer.java

@@ -33,7 +33,6 @@ public final class Helldozer extends CardImpl {
 
         // {B}{B}{B}, {tap}: Destroy target land. If that land was nonbasic, untap Helldozer.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new HelldozerEffect(),
                 new ManaCostsImpl<>("{B}{B}{B}"));
         ability.addTarget(new TargetLandPermanent());

Mage.Sets/src/mage/cards/h/HiredMuscle.java

@@ -76,7 +76,6 @@ class Scarmaker extends TokenImpl {
 
         // Remove a ki counter from Scarmaker: Target creature gains fear until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(FearAbility.getInstance(), Duration.EndOfTurn),
                 new RemoveCountersSourceCost(CounterType.KI.createInstance()));
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/h/HonorWornShaku.java

@@ -33,7 +33,6 @@ public final class HonorWornShaku extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
         this.addAbility(new ColorlessManaAbility());
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new UntapSourceEffect(),
                 new TapTargetCost(new TargetControlledPermanent(filter)));
         this.addAbility(ability);

Mage.Sets/src/mage/cards/h/HorrorOfTheDim.java

@@ -31,7 +31,6 @@ public final class HorrorOfTheDim extends CardImpl {
 
         // {U}: Horror of the Dim gains hexproof until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(HexproofAbility.getInstance(), Duration.EndOfTurn),
                 new ColoredManaCost(ColoredManaSymbol.U)));
     }

Mage.Sets/src/mage/cards/i/IbHalfheartGoblinTactician.java

@@ -53,7 +53,6 @@ public final class IbHalfheartGoblinTactician extends CardImpl {
 
         // Sacrifice two Mountains: Create two 1/1 red Goblin creature tokens.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new GoblinToken(), 2),
                 new SacrificeTargetCost(2, filter)));
 

Mage.Sets/src/mage/cards/i/ImmolationShaman.java

@@ -43,7 +43,6 @@ public final class ImmolationShaman extends CardImpl {
 
         // {3}{R}{R}: Immolation Shaman gets +3/+3 and gains menace until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(
                         3, 3, Duration.EndOfTurn
                 ).setText("{this} gets +3/+3"),

Mage.Sets/src/mage/cards/i/IzoniThousandEyed.java

@@ -48,7 +48,6 @@ public final class IzoniThousandEyed extends CardImpl {
 
         // {B}{G}, Sacrifice another creature: You gain 1 life and draw a card.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainLifeEffect(1),
                 new ManaCostsImpl<>("{B}{G}")
         );

Mage.Sets/src/mage/cards/k/KagemaroFirstToSuffer.java

@@ -44,7 +44,6 @@ public final class KagemaroFirstToSuffer extends CardImpl {
 
         DynamicValue xMinusValue = new SignInversionDynamicValue(xValue);
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostAllEffect(xMinusValue, xMinusValue, Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, false,
                         "All creatures get -X/-X until end of turn, where X is the number of cards in your hand"),
                 new ManaCostsImpl<>("{B}")

Mage.Sets/src/mage/cards/k/KelsinkoRanger.java

@@ -41,7 +41,6 @@ public final class KelsinkoRanger extends CardImpl {
 
         // {1}{W}: Target green creature gains first strike until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl<>("{1}{W}")
         );

Mage.Sets/src/mage/cards/k/KikuNightsFlower.java

@@ -38,7 +38,6 @@ public final class KikuNightsFlower extends CardImpl {
         // {2}{B}{B}, {T}: Target creature deals damage to itself equal to its power.
         Ability ability;
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new KikuNightsFlowerEffect(), 
                 new ManaCostsImpl<>("{2}{B}{B}")
         );
@@ -83,4 +82,3 @@ class KikuNightsFlowerEffect extends OneShotEffect {
         return false;
     }
 }
-

Mage.Sets/src/mage/cards/k/KithkinArmor.java

@@ -48,7 +48,6 @@ public final class KithkinArmor extends CardImpl {
 
         // Sacrifice Kithkin Armor: The next time a source of your choice would deal damage to enchanted creature this turn, prevent that damage.
         Ability protectionAbility = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new KithkinArmorPreventionEffect(),
                 new KithkinArmorCost());
         protectionAbility.addTarget(new TargetSource());

Mage.Sets/src/mage/cards/k/KnowledgeVault.java

@@ -30,7 +30,6 @@ public final class KnowledgeVault extends CardImpl {
 
         // {2}, {T}: Exile the top card of your library face down.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileCardsFromTopOfLibraryControllerEffect(1, true, true),
                 new GenericManaCost(2));
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/k/KyrenArchive.java

@@ -32,7 +32,6 @@ public final class KyrenArchive extends CardImpl {
 
         // {5}, Discard your hand, Sacrifice Kyren Archive: Put all cards exiled with Kyren Archive into their owner's hand.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ReturnFromExileForSourceEffect(Zone.HAND).withText(true, false, true),
                 new GenericManaCost(5)
         );

Mage.Sets/src/mage/cards/k/KyrenNegotiations.java

@@ -31,7 +31,6 @@ public final class KyrenNegotiations extends CardImpl {
 
         // Tap an untapped creature you control: Kyren Negotiations deals 1 damage to target player.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(1),
                 new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, false))
         );

Mage.Sets/src/mage/cards/l/LathlissDragonQueen.java

@@ -54,7 +54,6 @@ public final class LathlissDragonQueen extends CardImpl {
         ));
         // {1}{R}: Dragons you control get +1/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostControlledEffect(
                         1, 0, Duration.EndOfTurn,
                         filter2, false

Mage.Sets/src/mage/cards/l/LedevChampion.java

@@ -40,7 +40,6 @@ public final class LedevChampion extends CardImpl {
 
         // {3}{G}{W}: Create a 1/1 white soldier creature token with lifelink.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SoldierLifelinkToken()),
                 new ManaCostsImpl<>("{3}{G}{W}")
         ));

Mage.Sets/src/mage/cards/l/LightningMare.java

@@ -50,7 +50,6 @@ public final class LightningMare extends CardImpl {
 
         // {1}{R}: Lightning Mare gets +1/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1, 0, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{1}{R}")
         ));

Mage.Sets/src/mage/cards/l/Lithatog.java

@@ -32,12 +32,10 @@ public final class Lithatog extends CardImpl {
 
         // Sacrifice an artifact: Lithatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)));
         // Sacrifice a land: Lithatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_LAND)));
     }

Mage.Sets/src/mage/cards/m/MidnightSnack.java

@@ -40,7 +40,6 @@ public final class MidnightSnack extends CardImpl {
 
         // {2}{B}, Sacrifice this enchantment: Target opponent loses X life, where X is the amount of life you gained this turn.
         Ability sacrificeAbility = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new LoseLifeTargetEffect(ControllerGainedLifeCount.instance),
                 new ManaCostsImpl<>("{2}{B}")
         );

Mage.Sets/src/mage/cards/m/MoggAssassin.java

@@ -37,7 +37,6 @@ public final class MoggAssassin extends CardImpl {
 
         // {T}: You choose target creature an opponent controls, and that opponent chooses target creature. Flip a coin. If you win the flip, destroy the creature you chose. If you lose the flip, destroy the creature your opponent chose.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new MoggAssassinEffect(),
                 new TapSourceCost()
         );

Mage.Sets/src/mage/cards/m/Musician.java

@@ -42,7 +42,6 @@ public final class Musician extends CardImpl {
 
         // : Put a music counter on target creature. If it doesn’t have "At the beginning of your upkeep, destroy this creature unless you pay {1} for each music counter on it," it gains that ability.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersTargetEffect(CounterType.MUSIC.createInstance()),
                 new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());

Mage.Sets/src/mage/cards/m/MysticArchaeologist.java

@@ -27,7 +27,6 @@ public final class MysticArchaeologist extends CardImpl {
 
         // {3}{U}{U}: Draw two cards.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(2),
                 new ManaCostsImpl<>("{3}{U}{U}")
         ));

Mage.Sets/src/mage/cards/n/NobleSteeds.java

@@ -25,7 +25,6 @@ public final class NobleSteeds extends CardImpl {
 
         // {1}{W}: Target creature gains first strike until end of turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn),
                 new ManaCostsImpl<>("{1}{W}")
         );

Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java

@@ -76,7 +76,6 @@ class ShidakoBroodmistress extends TokenImpl {
         // {G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn.
         Ability ability;
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostTargetEffect(3, 3, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{G}"));
         ability.addCost(new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));

Mage.Sets/src/mage/cards/p/PasswallAdept.java

@@ -29,7 +29,6 @@ public final class PasswallAdept extends CardImpl {
 
         // {2}{U}: Target creature can't be blocked this turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CantBeBlockedTargetEffect(),
                 new ManaCostsImpl<>("{2}{U}")
         );

Mage.Sets/src/mage/cards/p/PerilousVault.java

@@ -25,7 +25,6 @@ public final class PerilousVault extends CardImpl {
 
         // {5}, {T}, Exile Perilous Vault: Exile all nonland permanents.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileAllEffect(StaticFilters.FILTER_PERMANENTS_NON_LAND),
                 new GenericManaCost(5)
         );

Mage.Sets/src/mage/cards/p/Phantatog.java

@@ -32,12 +32,10 @@ public final class Phantatog extends CardImpl {
 
         // Sacrifice an enchantment: Phantatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ENCHANTMENT)));
         // Discard a card: Phantatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new DiscardCardCost()));
     }

Mage.Sets/src/mage/cards/p/PlanarBridge.java

@@ -28,7 +28,6 @@ public final class PlanarBridge extends CardImpl {
 
         // {8}, {T}: Search your library for a permanent card, put it onto the battlefield, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterPermanentCard())),
                 new GenericManaCost(8)
         );

Mage.Sets/src/mage/cards/p/PsionicSliver.java

@@ -36,7 +36,6 @@ public final class PsionicSliver extends CardImpl {
 
         // All Sliver creatures have "{T}: This creature deals 2 damage to any target and 3 damage to itself."
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(2).setText("This creature deals 2 damage to any target"),
                 new TapSourceCost()
         );

Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java

@@ -30,13 +30,11 @@ public final class PyxisOfPandemonium extends CardImpl {
 
         // {T}: Each player exiles the top card of their library face down.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PyxisOfPandemoniumExileEffect(),
                 new TapSourceCost()));
 
         // {7}, {T}, Sacrifice Pyxis of Pandemonium: Each player turns face up all cards they own exiled with Pyxis of Pandemonium, then puts all permanent cards among them onto the battlefield.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PyxisOfPandemoniumPutOntoBattlefieldEffect(),
                 new GenericManaCost(7));
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/r/RavenousHarpy.java

@@ -35,7 +35,6 @@ public final class RavenousHarpy extends CardImpl {
 
         // {1}, Sacrifice another creature: Put a +1/+1 counter on Ravenous Harpy.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
                 new GenericManaCost(1)
         );

Mage.Sets/src/mage/cards/r/RenegadeMap.java

@@ -30,7 +30,6 @@ public final class RenegadeMap extends CardImpl {
 
         // {T}, Sacrifice Renegade Map: Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true),
                 new TapSourceCost()
         );

Mage.Sets/src/mage/cards/r/RetrofitterFoundry.java

@@ -38,7 +38,6 @@ public final class RetrofitterFoundry extends CardImpl {
 
         // {3}: Untap Retrofitter Foundry.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new UntapSourceEffect(),
                 new GenericManaCost(3))
         );

Mage.Sets/src/mage/cards/r/RimefeatherOwl.java

@@ -58,7 +58,6 @@ public final class RimefeatherOwl extends CardImpl {
 
         // {1}{snow}: Put an ice counter on target permanent.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersTargetEffect(CounterType.ICE.createInstance())
                         .setText("Put an ice counter on target permanent."),
                 new ManaCostsImpl<>("{1}{S}")

Mage.Sets/src/mage/cards/r/RonaDiscipleOfGix.java

@@ -53,7 +53,6 @@ public final class RonaDiscipleOfGix extends CardImpl {
 
         // {4}, {T}: Exile the top card of your library.
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileCardsFromTopOfLibraryControllerEffect(1, true),
                 new GenericManaCost(4));
         ability.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/r/RukarumelBiologist.java

@@ -58,7 +58,6 @@ public final class RukarumelBiologist extends CardImpl {
 
         // {3}, {T}: Create a 1/1 colorless Sliver creature token.
         ActivatedAbility activated = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CreateTokenEffect(new SliverToken()),
                 new ManaCostsImpl<>("{3}")
         );

Mage.Sets/src/mage/cards/r/RuthlessKnave.java

@@ -47,7 +47,6 @@ public final class RuthlessKnave extends CardImpl {
 
         // Sacrifice three Treasures: Draw a card.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(1),
                 new SacrificeTargetCost(3, filter)
         ));

Mage.Sets/src/mage/cards/s/SaiMasterThopterist.java

@@ -42,7 +42,6 @@ public final class SaiMasterThopterist extends CardImpl {
 
         // {1}{U}, Sacrifice two artifacts: Draw a card.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DrawCardSourceControllerEffect(1),
                 new ManaCostsImpl<>("{1}{U}")
         );

Mage.Sets/src/mage/cards/s/SakuraTribeScout.java

@@ -30,7 +30,6 @@ public final class SakuraTribeScout extends CardImpl {
 
         // {tap}: You may put a land card from your hand onto the battlefield.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A),
                 new TapSourceCost()
         ));

Mage.Sets/src/mage/cards/s/Sarcatog.java

@@ -34,13 +34,11 @@ public final class Sarcatog extends CardImpl {
 
         // Exile two cards from your graveyard: Sarcatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new ExileFromGraveCost(new TargetCardInYourGraveyard(2,new FilterCard("cards")))));
 
         // Sacrifice an artifact: Sarcatog gets +1/+1 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1,1, Duration.EndOfTurn),
                 new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_ARTIFACT)));
     }

Mage.Sets/src/mage/cards/s/ScarlandThrinax.java

@@ -32,7 +32,6 @@ public final class ScarlandThrinax extends CardImpl {
 
         // Sacrifice a creature: Put a +1/+1 counter on Scarland Thrinax.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
                 new SacrificeTargetCost(StaticFilters.FILTER_PERMANENT_CREATURE));
         this.addAbility(ability);

Mage.Sets/src/mage/cards/s/ScavengerGrounds.java

@@ -39,7 +39,6 @@ public final class ScavengerGrounds extends CardImpl {
 
         // {2}, {T}, Sacrifice a Desert: Exile all cards from all graveyards.
         Ability ability2 = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileGraveyardAllPlayersEffect(),
                 new ManaCostsImpl<>("{2}"));
         ability2.addCost(new TapSourceCost());

Mage.Sets/src/mage/cards/s/ScrabblingClaws.java

@@ -34,7 +34,6 @@ public final class ScrabblingClaws extends CardImpl {
 
         // {tap}: Target player exiles a card from their graveyard.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ScrabblingClawsEffect(), new
                 TapSourceCost()
         );
@@ -43,7 +42,6 @@ public final class ScrabblingClaws extends CardImpl {
 
         // {1}, Sacrifice Scrabbling Claws: Exile target card from a graveyard. Draw a card.
         ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new ExileTargetEffect(),
                 new GenericManaCost(1)
         );

Mage.Sets/src/mage/cards/s/ScreechingPhoenix.java

@@ -31,7 +31,6 @@ public final class ScreechingPhoenix extends CardImpl {
 
         // {2}{R}: Creatures you control get +1/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostControlledEffect(1, 0, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{2}{R}")
         ));

Mage.Sets/src/mage/cards/s/SeraphOfTheScales.java

@@ -34,7 +34,6 @@ public final class SeraphOfTheScales extends CardImpl {
 
         // {W}: Seraph of the Scales gains vigilance until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         VigilanceAbility.getInstance(),
                         Duration.EndOfTurn
@@ -43,7 +42,6 @@ public final class SeraphOfTheScales extends CardImpl {
 
         // {B}: Seraph of the Scales gains deathtouch until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         DeathtouchAbility.getInstance(),
                         Duration.EndOfTurn

Mage.Sets/src/mage/cards/s/SiegebreakerGiant.java

@@ -34,7 +34,6 @@ public final class SiegebreakerGiant extends CardImpl {
 
         // {3}{R}: Target creature can't block this turn.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new CantBlockTargetEffect(Duration.EndOfTurn),
                 new ManaCostsImpl<>("{3}{R}")
         );

Mage.Sets/src/mage/cards/s/SilentDart.java

@@ -24,7 +24,6 @@ public final class SilentDart extends CardImpl {
 
         // {4}, {T}, Sacrifice Silent Dart: It deals 3 damage to target creature.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new DamageTargetEffect(3, "it"),
                 new GenericManaCost(4)
         );

Mage.Sets/src/mage/cards/s/SkyshroudVampire.java

@@ -32,7 +32,6 @@ public final class SkyshroudVampire extends CardImpl {
 
         // Discard a creature card: Skyshroud Vampire gets +2/+2 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, 2, Duration.EndOfTurn),
                 new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE))));
     }

Mage.Sets/src/mage/cards/s/SoulRansom.java

@@ -42,7 +42,6 @@ public final class SoulRansom extends CardImpl {
 
         // Discard two cards: Soul Ransom's controller sacrifices it, then draws two cards. Only any opponent may activate this ability.
         SimpleActivatedAbility ability2 = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new SoulRansomEffect(),
                 new DiscardTargetCost(
                         new TargetCardInHand(2, StaticFilters.FILTER_CARD_CARDS)

Mage.Sets/src/mage/cards/s/SoulstoneSanctuary.java

@@ -30,7 +30,6 @@ public final class SoulstoneSanctuary extends CardImpl {
 
         // {4}: This land becomes a 3/3 creature with vigilance and all creature types. It's still a land.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BecomesCreatureSourceEffect(new SoulStoneSanctuaryToken(), CardType.LAND, Duration.WhileOnBattlefield)
                         .setText("this land becomes a 3/3 creature with vigilance and all creature types. It's still a land"),
                 new GenericManaCost(4)

Mage.Sets/src/mage/cards/s/SteelHellkite.java

@@ -44,7 +44,6 @@ public final class SteelHellkite extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // {2}: Steel Hellkite gets +1/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(1, 0, Duration.EndOfTurn),
                 new GenericManaCost(2)
         ));

Mage.Sets/src/mage/cards/s/StonehewerGiant.java

@@ -42,7 +42,6 @@ public final class StonehewerGiant extends CardImpl {
         this.addAbility(VigilanceAbility.getInstance());
         // {1}{W}, {tap}: Search your library for an Equipment card and put it onto the battlefield. Attach it to a creature you control. Then shuffle your library.
         Ability ability = new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new StonehewerGiantEffect(),
                 new ManaCostsImpl<>("{1}{W}")
         );

Mage.Sets/src/mage/cards/s/SunCollaredRaptor.java

@@ -32,7 +32,6 @@ public final class SunCollaredRaptor extends CardImpl {
 
         // {2}{R}: Sun-Collared Raptor gets +3/+0 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(3, 0, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{2}{R}"))
         );

Mage.Sets/src/mage/cards/s/SurgeMare.java

@@ -55,7 +55,6 @@ public final class SurgeMare extends CardImpl {
 
         // {1}{U}: Surge Mare gets +2/-2 until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new BoostSourceEffect(2, -2, Duration.EndOfTurn),
                 new ManaCostsImpl<>("{1}{U}")
         ));

Mage.Sets/src/mage/cards/t/TajicLegionsEdge.java

@@ -57,7 +57,6 @@ public final class TajicLegionsEdge extends CardImpl {
 
         // {R}{W}: Tajic, Legion's Edge gains first strike until end of turn.
         this.addAbility(new SimpleActivatedAbility(
-                Zone.BATTLEFIELD,
                 new GainAbilitySourceEffect(
                         FirstStrikeAbility.getInstance(),
                         Duration.EndOfTurn