diff --git a/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java b/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java
index ba5219cde54..ee81aa49597 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/Crystallization.java
@@ -87,7 +87,7 @@ public class Crystallization extends CardImpl<Crystallization> {
     }
 }
 
-class CrystallizationTriggeredAbility extends TriggeredAbilityImpl<CrystallizationTriggeredAbility> {
+class CrystallizationTriggeredAbility extends TriggeredAbilityImpl {
     
     public CrystallizationTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ExileTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/alarareborn/DragonAppeasement.java b/Mage.Sets/src/mage/sets/alarareborn/DragonAppeasement.java
index 51062964959..083a043ad7a 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/DragonAppeasement.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/DragonAppeasement.java
@@ -110,7 +110,7 @@ class SkipYourDrawStepEffect extends ReplacementEffectImpl<SkipYourDrawStepEffec
     }
 }
 
-class DragonAppeasementTriggeredAbility extends TriggeredAbilityImpl<DragonAppeasementTriggeredAbility> {
+class DragonAppeasementTriggeredAbility extends TriggeredAbilityImpl {
 
     public DragonAppeasementTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java
index 3a6f641dc5a..35e529a9f2b 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/FinestHour.java
@@ -80,7 +80,7 @@ public class FinestHour extends CardImpl<FinestHour> {
 
 }
 
-class FinestHourAbility extends TriggeredAbilityImpl<FinestHourAbility> {
+class FinestHourAbility extends TriggeredAbilityImpl {
 
     public FinestHourAbility() {
         super(Zone.BATTLEFIELD, new FinestHourEffect());
diff --git a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java
index 7293e3ebfa7..10a2a4929cd 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/GloryscaleViashino.java
@@ -71,7 +71,7 @@ public class GloryscaleViashino extends CardImpl<GloryscaleViashino> {
 
 }
 
-class GloryscaleViashinoAbility extends TriggeredAbilityImpl<GloryscaleViashinoAbility> {
+class GloryscaleViashinoAbility extends TriggeredAbilityImpl {
     public GloryscaleViashinoAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(3, 3, Duration.EndOfTurn));
     }
diff --git a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
index a5248107a9c..e594d73f0bb 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/MaelstromNexus.java
@@ -78,7 +78,7 @@ public class MaelstromNexus extends CardImpl<MaelstromNexus> {
     }
 }
 
-class MaelstromNexusTriggeredAbility extends TriggeredAbilityImpl<MaelstromNexusTriggeredAbility> {
+class MaelstromNexusTriggeredAbility extends TriggeredAbilityImpl {
 
     public MaelstromNexusTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CascadeEffect());
diff --git a/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java b/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java
index b514d73a21d..5f13862b8a5 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/MycoidShepherd.java
@@ -73,7 +73,7 @@ public class MycoidShepherd extends CardImpl<MycoidShepherd> {
     }
 }
 
-class MycoidShepherdTriggeredAbility extends TriggeredAbilityImpl<MycoidShepherdTriggeredAbility> {
+class MycoidShepherdTriggeredAbility extends TriggeredAbilityImpl {
 
     public MycoidShepherdTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(5), true);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java
index d4b79cee591..c7dc0b1c1be 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/NemesisOfReason.java
@@ -70,7 +70,7 @@ public class NemesisOfReason extends CardImpl<NemesisOfReason> {
     }
 }
 
-class NemesisOfReasonTriggeredAbility extends TriggeredAbilityImpl<NemesisOfReasonTriggeredAbility> {
+class NemesisOfReasonTriggeredAbility extends TriggeredAbilityImpl {
     NemesisOfReasonTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(10));
     }
diff --git a/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java b/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java
index 0d6f76f5f62..d5008657013 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/RetaliatorGriffin.java
@@ -76,7 +76,7 @@ public class RetaliatorGriffin extends CardImpl<RetaliatorGriffin> {
     }
 }
 
-class RetaliatorGriffinTriggeredAbility extends TriggeredAbilityImpl<RetaliatorGriffinTriggeredAbility> {
+class RetaliatorGriffinTriggeredAbility extends TriggeredAbilityImpl {
 
     public RetaliatorGriffinTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RetaliatorGriffinEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/SigilCaptain.java b/Mage.Sets/src/mage/sets/alarareborn/SigilCaptain.java
index b77f8229ece..2beb15662a4 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/SigilCaptain.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/SigilCaptain.java
@@ -73,7 +73,7 @@ public class SigilCaptain extends CardImpl<SigilCaptain> {
     }
 }
 
-class SigilCaptainTriggeredAbility extends TriggeredAbilityImpl<SigilCaptainTriggeredAbility> {
+class SigilCaptainTriggeredAbility extends TriggeredAbilityImpl {
 
     public SigilCaptainTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(2)));
diff --git a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
index e93bf33fb9b..b41f0f10e24 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
@@ -84,7 +84,7 @@ public class SovereignsOfLostAlara extends CardImpl<SovereignsOfLostAlara> {
     }
 }
 
-class CreatureControlledAttacksAloneTriggeredAbility extends TriggeredAbilityImpl<CreatureControlledAttacksAloneTriggeredAbility> {
+class CreatureControlledAttacksAloneTriggeredAbility extends TriggeredAbilityImpl {
 
     public CreatureControlledAttacksAloneTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SovereignsOfLostAlaraEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/Thraximundar.java b/Mage.Sets/src/mage/sets/alarareborn/Thraximundar.java
index 29faa74d487..825400b6693 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/Thraximundar.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/Thraximundar.java
@@ -86,7 +86,7 @@ public class Thraximundar extends CardImpl<Thraximundar> {
     }
 }
 
-class ThraximundarTriggeredAbility extends TriggeredAbilityImpl<ThraximundarTriggeredAbility> {
+class ThraximundarTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledPermanent filter;
 
@@ -125,7 +125,7 @@ class ThraximundarTriggeredAbility extends TriggeredAbilityImpl<ThraximundarTrig
     }
 }
 
-class PlayerSacrificesCreatureTriggeredAbility extends TriggeredAbilityImpl<PlayerSacrificesCreatureTriggeredAbility> {
+class PlayerSacrificesCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     public PlayerSacrificesCreatureTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
index dc37cd6f642..9f296b5c230 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/UnscytheKillerOfKings.java
@@ -96,7 +96,7 @@ public class UnscytheKillerOfKings extends CardImpl<UnscytheKillerOfKings> {
     }
 }
 
-class UnscytheKillerOfKingsTriggeredAbility extends TriggeredAbilityImpl<UnscytheKillerOfKingsTriggeredAbility> {
+class UnscytheKillerOfKingsTriggeredAbility extends TriggeredAbilityImpl {
 
     public UnscytheKillerOfKingsTriggeredAbility(Effect effect) {
         this(effect, true);
diff --git a/Mage.Sets/src/mage/sets/alarareborn/VedalkenGhoul.java b/Mage.Sets/src/mage/sets/alarareborn/VedalkenGhoul.java
index b33cd32a197..0fb17587be3 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/VedalkenGhoul.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/VedalkenGhoul.java
@@ -72,7 +72,7 @@ public class VedalkenGhoul extends CardImpl<VedalkenGhoul> {
     }
 }
 
-class VedalkenGhoulTriggeredAbility extends TriggeredAbilityImpl<VedalkenGhoulTriggeredAbility> {
+class VedalkenGhoulTriggeredAbility extends TriggeredAbilityImpl {
 
     public VedalkenGhoulTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(4), false);
diff --git a/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java b/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java
index 46355953da5..8258418b55e 100644
--- a/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java
+++ b/Mage.Sets/src/mage/sets/antiquities/CandelabraOfTawnos.java
@@ -70,7 +70,7 @@ public class CandelabraOfTawnos extends CardImpl<CandelabraOfTawnos> {
 
 
 
-class CandelabraOfTawnosAbility extends ActivatedAbilityImpl<CandelabraOfTawnosAbility> implements AdjustingSourceCosts{
+class CandelabraOfTawnosAbility extends ActivatedAbilityImpl implements AdjustingSourceCosts{
     public CandelabraOfTawnosAbility(){
         super(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost());
         addTarget(new TargetLandPermanent(0, Integer.MAX_VALUE, new FilterLandPermanent(), false));
diff --git a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java
index d1083a4868e..91c77e918f1 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/BogGnarr.java
@@ -71,7 +71,7 @@ public class BogGnarr extends CardImpl<BogGnarr> {
 
 }
 
-class BogGnarrTriggeredAbility extends TriggeredAbilityImpl<BogGnarrTriggeredAbility> {
+class BogGnarrTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCard filter = new FilterCard("a black spell");
 
diff --git a/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java b/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java
index 03078ed42d9..f052079700f 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/GladeGnarr.java
@@ -70,7 +70,7 @@ public class GladeGnarr extends CardImpl<GladeGnarr> {
     }
 }
 
-class GladeGnarrTriggeredAbility extends TriggeredAbilityImpl<GladeGnarrTriggeredAbility> {
+class GladeGnarrTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCard filter = new FilterCard("a black spell");
 
diff --git a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java
index 08173f176ac..3a2233c238c 100644
--- a/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java
+++ b/Mage.Sets/src/mage/sets/arabiannights/OldManOfTheSea.java
@@ -127,7 +127,7 @@ creature to Old Man of the seas power. It's not possible to do this as condition
 time the effect checks its condition, the layered effects that modify power are not applied yet.
 result is save to a state value to be available for the condition of the continuous effect
 */
-class OldManOfTheSeaStateBasedTriggeredAbility extends StateTriggeredAbility<OldManOfTheSeaStateBasedTriggeredAbility> {
+class OldManOfTheSeaStateBasedTriggeredAbility extends StateTriggeredAbility {
 
     public OldManOfTheSeaStateBasedTriggeredAbility() {
         super(Zone.BATTLEFIELD, new EmptyEffect(""));
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java b/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java
index b9d437c2a24..9b52425ada2 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/ExquisiteBlood.java
@@ -64,7 +64,7 @@ public class ExquisiteBlood extends CardImpl<ExquisiteBlood> {
     }
 }
 
-class ExquisiteBloodTriggeredAbility extends TriggeredAbilityImpl<ExquisiteBloodTriggeredAbility> {
+class ExquisiteBloodTriggeredAbility extends TriggeredAbilityImpl {
 
     public ExquisiteBloodTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java
index 561d491b6b3..af10ee64dad 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/HavengulSkaab.java
@@ -73,7 +73,7 @@ public class HavengulSkaab extends CardImpl<HavengulSkaab> {
     }
 }
 
-class HavengulSkaabAbility extends TriggeredAbilityImpl<HavengulSkaabAbility> {
+class HavengulSkaabAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java b/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java
index 0c5ec669d1e..30140cbca13 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/HuntedGhoul.java
@@ -68,7 +68,7 @@ public class HuntedGhoul extends CardImpl<HuntedGhoul> {
     }
 }
 
-class HuntedGhoulAbility extends EvasionAbility<HuntedGhoulAbility> {
+class HuntedGhoulAbility extends EvasionAbility {
 
     private static HuntedGhoulAbility instance;
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java b/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java
index c974dfce397..8e4f482be0b 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/LoneRevenant.java
@@ -75,7 +75,7 @@ public class LoneRevenant extends CardImpl<LoneRevenant> {
     }
 }
 
-class LoneRevenantTriggeredAbility extends TriggeredAbilityImpl<LoneRevenantTriggeredAbility> {
+class LoneRevenantTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java
index cc838e6846c..8c0e3741d5f 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/SpectralPrison.java
@@ -86,7 +86,7 @@ public class SpectralPrison extends CardImpl<SpectralPrison> {
     }
 }
 
-class SpectralPrisonAbility extends TriggeredAbilityImpl<SpectralPrisonAbility> {
+class SpectralPrisonAbility extends TriggeredAbilityImpl {
 
     public SpectralPrisonAbility() {
         super(Zone.BATTLEFIELD, new DestroySourceEffect());
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
index 3582ee6c6f5..31b414bcedf 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/TamiyoTheMoonSage.java
@@ -133,7 +133,7 @@ class TappedCreaturesControlledByTargetCount implements DynamicValue {
     }
 }
 
-class TamiyoTheMoonSageTriggeredAbility extends TriggeredAbilityImpl<TamiyoTheMoonSageTriggeredAbility> {
+class TamiyoTheMoonSageTriggeredAbility extends TriggeredAbilityImpl {
 
     public TamiyoTheMoonSageTriggeredAbility() {
         super(Zone.COMMAND, new TamiyoTheMoonSageEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java b/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java
index feb1949ce72..02eb6836061 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/WildDefiance.java
@@ -70,7 +70,7 @@ public class WildDefiance extends CardImpl<WildDefiance> {
     }
 }
 
-class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityImpl<CreaturesYouControlBecomesTargetTriggeredAbility> {
+class CreaturesYouControlBecomesTargetTriggeredAbility extends TriggeredAbilityImpl {
 
     public CreaturesYouControlBecomesTargetTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java
index c5cd26624f2..1e08dd0100f 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/JettingGlasskite.java
@@ -74,7 +74,7 @@ public class JettingGlasskite extends CardImpl<JettingGlasskite> {
     }
 }
 
-class JettingGlasskiteAbility extends TriggeredAbilityImpl<JettingGlasskiteAbility> {
+class JettingGlasskiteAbility extends TriggeredAbilityImpl {
 
     protected int turnUsed;
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java
index 225edf099bf..25841fc6590 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KamiOfTheHonoredDead.java
@@ -77,7 +77,7 @@ public class KamiOfTheHonoredDead extends CardImpl<KamiOfTheHonoredDead> {
     }
 }
 
-class KamiOfTheHonoredDeadTriggeredAbility extends TriggeredAbilityImpl<KamiOfTheHonoredDeadTriggeredAbility> {
+class KamiOfTheHonoredDeadTriggeredAbility extends TriggeredAbilityImpl {
 
     public KamiOfTheHonoredDeadTriggeredAbility() {
         super(Zone.BATTLEFIELD, new KamiOfTheHonoredDeadGainLifeEffect());
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
index cc5231505b3..0f5116ba3b9 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KiraGreatGlassSpinner.java
@@ -84,7 +84,7 @@ public class KiraGreatGlassSpinner extends CardImpl<KiraGreatGlassSpinner> {
 // not perfectly implemented. It doesnt't handles if a creature was already targeted the turn Kira comes into play.
 // Maybe it's better to implement it with a watcher
 
-class KiraGreatGlassSpinnerAbility extends TriggeredAbilityImpl<KiraGreatGlassSpinnerAbility> {
+class KiraGreatGlassSpinnerAbility extends TriggeredAbilityImpl {
 
     protected Map<UUID,Integer> turnUsed = new HashMap<UUID,Integer>();
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
index cc3cff5113f..4140f06949c 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MistbladeShinobi.java
@@ -77,7 +77,7 @@ public class MistbladeShinobi extends CardImpl<MistbladeShinobi> {
     }
 }
 
-class MistbladeShinobiTriggeredAbility extends TriggeredAbilityImpl<MistbladeShinobiTriggeredAbility> {
+class MistbladeShinobiTriggeredAbility extends TriggeredAbilityImpl {
 
     MistbladeShinobiTriggeredAbility() {
         super(Zone.BATTLEFIELD,  new ReturnToHandTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java
index 9d5c0563752..c9abe0b3164 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheKitsune.java
@@ -72,7 +72,7 @@ public class PatronOfTheKitsune extends CardImpl<PatronOfTheKitsune> {
     }
 }
 
-class PatronOfTheKitsuneTriggeredAbility extends TriggeredAbilityImpl<PatronOfTheKitsuneTriggeredAbility> {
+class PatronOfTheKitsuneTriggeredAbility extends TriggeredAbilityImpl {
 
     public PatronOfTheKitsuneTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java
index 7ce5caa6fa6..62e57fffead 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/PatronOfTheNezumi.java
@@ -77,7 +77,7 @@ public class PatronOfTheNezumi extends CardImpl<PatronOfTheNezumi> {
     }
 }
 
-class PatronOfTheNezumiTriggeredAbility extends TriggeredAbilityImpl<PatronOfTheNezumiTriggeredAbility> {
+class PatronOfTheNezumiTriggeredAbility extends TriggeredAbilityImpl {
 
     public PatronOfTheNezumiTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java
index 4a0049e1198..116b5e31650 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/RoninWarclub.java
@@ -77,7 +77,7 @@ public class RoninWarclub extends CardImpl<RoninWarclub> {
         return new RoninWarclub(this);
     }
     
-    private class RoninWarclubTriggeredAbility extends TriggeredAbilityImpl<RoninWarclubTriggeredAbility> {
+    private class RoninWarclubTriggeredAbility extends TriggeredAbilityImpl {
 
         public RoninWarclubTriggeredAbility() {
            super(Zone.BATTLEFIELD, new RoninWarclubAttachEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java
index c657a25caa7..37bcb0a4716 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ShimmeringGlasskite.java
@@ -74,7 +74,7 @@ public class ShimmeringGlasskite extends CardImpl<ShimmeringGlasskite> {
     }
 }
 
-class ShimmeringGlasskiteAbility extends TriggeredAbilityImpl<ShimmeringGlasskiteAbility> {
+class ShimmeringGlasskiteAbility extends TriggeredAbilityImpl {
 
     protected int turnUsed;
 
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java
index c99f6bd86d1..b10047e233c 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/Skullsnatcher.java
@@ -85,7 +85,7 @@ public class Skullsnatcher extends CardImpl<Skullsnatcher> {
     }
 }
 
-class SkullsnatcherTriggeredAbility extends TriggeredAbilityImpl<SkullsnatcherTriggeredAbility> {
+class SkullsnatcherTriggeredAbility extends TriggeredAbilityImpl {
 
     SkullsnatcherTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ExileTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
index 4ded6b583d4..146ff82894e 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/ThroatSlitter.java
@@ -79,7 +79,7 @@ public class ThroatSlitter extends CardImpl<ThroatSlitter> {
     }
 }
 
-class ThroatSlitterTriggeredAbility extends TriggeredAbilityImpl<ThroatSlitterTriggeredAbility> {
+class ThroatSlitterTriggeredAbility extends TriggeredAbilityImpl {
 
     ThroatSlitterTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java
index edb2a732511..899732a995e 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/UmezawasJitte.java
@@ -88,7 +88,7 @@ public class UmezawasJitte extends CardImpl<UmezawasJitte> {
     }
 }
 
-class UmezawasJitteAbility extends TriggeredAbilityImpl<UmezawasJitteAbility> {
+class UmezawasJitteAbility extends TriggeredAbilityImpl {
 
     public UmezawasJitteAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(2)));
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/PerplexingChimera.java b/Mage.Sets/src/mage/sets/bornofthegods/PerplexingChimera.java
index 7f1f2b1c11b..baecb4972bb 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/PerplexingChimera.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/PerplexingChimera.java
@@ -121,7 +121,7 @@ public class PerplexingChimera extends CardImpl<PerplexingChimera> {
     }
 }
 
-class PerplexingChimeraTriggeredAbility extends TriggeredAbilityImpl<PerplexingChimeraTriggeredAbility> {
+class PerplexingChimeraTriggeredAbility extends TriggeredAbilityImpl {
 
     public PerplexingChimeraTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PerplexingChimeraControlExchangeEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
index 04b705f360a..a6472054fe7 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SatyrFiredancer.java
@@ -93,7 +93,7 @@ public class SatyrFiredancer extends CardImpl<SatyrFiredancer> {
     }
 }
 
-class SatyrFiredancerTriggeredAbility extends TriggeredAbilityImpl<SatyrFiredancerTriggeredAbility> {
+class SatyrFiredancerTriggeredAbility extends TriggeredAbilityImpl {
 
     private List<UUID> handledStackObjects = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java b/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java
index a539e9781f0..ecc8fbd7d8b 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SearingBlood.java
@@ -100,7 +100,7 @@ class SearingBloodEffect extends OneShotEffect<SearingBloodEffect> {
     }
 }
 
-class SearingBloodDelayedTriggeredAbility extends DelayedTriggeredAbility<SearingBloodDelayedTriggeredAbility> {
+class SearingBloodDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID target;
 
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpitefulReturned.java b/Mage.Sets/src/mage/sets/bornofthegods/SpitefulReturned.java
index ae765cc2879..db97831e836 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/SpitefulReturned.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/SpitefulReturned.java
@@ -80,7 +80,7 @@ public class SpitefulReturned extends CardImpl<SpitefulReturned> {
     }
 }
 
-class SpitefulReturnedTriggeredAbility extends TriggeredAbilityImpl<SpitefulReturnedTriggeredAbility> {
+class SpitefulReturnedTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpitefulReturnedTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java
index fd66fd05406..db04b3e1e82 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiLavarunner.java
@@ -53,7 +53,7 @@ public class AkkiLavarunner extends CardImpl<AkkiLavarunner> {
     }
 }
 
-class AkkiLavarunnerAbility extends TriggeredAbilityImpl<AkkiLavarunnerAbility> {
+class AkkiLavarunnerAbility extends TriggeredAbilityImpl {
 
     public AkkiLavarunnerAbility() {
         super(Zone.BATTLEFIELD, new FlipSourceEffect(new TokTokVolcanoBorn()));
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java
index 272c4ae647b..2b18fa49381 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/AkkiUnderminer.java
@@ -73,7 +73,7 @@ public class AkkiUnderminer extends CardImpl<AkkiUnderminer> {
 
 }
 
-class AkkiUnderminerAbility extends TriggeredAbilityImpl<AkkiUnderminerAbility> {
+class AkkiUnderminerAbility extends TriggeredAbilityImpl {
 
     public AkkiUnderminerAbility() {
         super(Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 1, ""));
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java
index 1c46fe20f99..201e77c41cb 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/FieldOfReality.java
@@ -84,7 +84,7 @@ public class FieldOfReality extends CardImpl<FieldOfReality> {
 
 }
 
-class FieldOfRealityEvasionAbility extends EvasionAbility<FieldOfRealityEvasionAbility> {
+class FieldOfRealityEvasionAbility extends EvasionAbility {
 
     public FieldOfRealityEvasionAbility() {
         this.addEffect(new FieldOfRealityEvasionEffect());
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
index 5f69c430d3b..75217a2d7b1 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ForbiddenOrchard.java
@@ -67,7 +67,7 @@ public class ForbiddenOrchard extends CardImpl<ForbiddenOrchard> {
     }
 }
 
-class ForbiddenOrchardTriggeredAbility extends TriggeredAbilityImpl<ForbiddenOrchardTriggeredAbility> {
+class ForbiddenOrchardTriggeredAbility extends TriggeredAbilityImpl {
 
     public ForbiddenOrchardTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new SpiritToken()));
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java
index 069e006e7a6..10ba7ccc8ab 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GlimpseOfNature.java
@@ -64,7 +64,7 @@ public class GlimpseOfNature extends CardImpl<GlimpseOfNature> {
 
 }
 
-class GlimpseOfNatureTriggeredAbility extends DelayedTriggeredAbility<GlimpseOfNatureTriggeredAbility> {
+class GlimpseOfNatureTriggeredAbility extends DelayedTriggeredAbility {
 
     private static final FilterSpell filter = new FilterSpell();
     static {
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/GodoBanditWarlord.java b/Mage.Sets/src/mage/sets/championsofkamigawa/GodoBanditWarlord.java
index 4c608ac8e59..e93858582b3 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/GodoBanditWarlord.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/GodoBanditWarlord.java
@@ -98,7 +98,7 @@ public class GodoBanditWarlord extends CardImpl<GodoBanditWarlord> {
     }
 }
 
-class GodoBanditWarlordAttacksTriggeredAbility extends TriggeredAbilityImpl<GodoBanditWarlordAttacksTriggeredAbility> {
+class GodoBanditWarlordAttacksTriggeredAbility extends TriggeredAbilityImpl {
 
     public GodoBanditWarlordAttacksTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java
index e4cdd0ef7ee..fe42ef3ac21 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/HorobiDeathsWail.java
@@ -83,7 +83,7 @@ public class HorobiDeathsWail extends CardImpl<HorobiDeathsWail> {
 
 }
 
-class HorobiDeathsWailAbility extends TriggeredAbilityImpl<HorobiDeathsWailAbility> {
+class HorobiDeathsWailAbility extends TriggeredAbilityImpl {
 
     public HorobiDeathsWailAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/KusariGama.java b/Mage.Sets/src/mage/sets/championsofkamigawa/KusariGama.java
index f4724f2c5d2..8935efd6054 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/KusariGama.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/KusariGama.java
@@ -85,7 +85,7 @@ public class KusariGama extends CardImpl<KusariGama> {
     }
 }
 
-class KusariGamaAbility extends TriggeredAbilityImpl<KusariGamaAbility> {
+class KusariGamaAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterBlockingCreature();
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NaturesWill.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NaturesWill.java
index e25736afa58..d0208c325bd 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/NaturesWill.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NaturesWill.java
@@ -72,7 +72,7 @@ public class NaturesWill extends CardImpl<NaturesWill> {
     }
 }
 
-class NaturesWillTriggeredAbility extends TriggeredAbilityImpl<NaturesWillTriggeredAbility> {
+class NaturesWillTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean madeDamge = false;
     private Set<UUID> damagedPlayers = new HashSet<UUID>();
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java b/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java
index 1ccd1adafaf..35f09a6cdd4 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/NightDealings.java
@@ -85,7 +85,7 @@ public class NightDealings extends CardImpl<NightDealings> {
     }
 
 
-    private class NightDealingsTriggeredAbility extends TriggeredAbilityImpl<NightDealingsTriggeredAbility> {
+    private class NightDealingsTriggeredAbility extends TriggeredAbilityImpl {
 
         public NightDealingsTriggeredAbility() {
             super(Zone.BATTLEFIELD, new NightDealingsEffect());
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java
index fbcafd469d3..aa95e60cd46 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/PainwrackerOni.java
@@ -77,7 +77,7 @@ public class PainwrackerOni extends CardImpl<PainwrackerOni> {
 
 }
 
-class PainwrackerOniTriggeredAbility1 extends TriggeredAbilityImpl<PainwrackerOniTriggeredAbility1> {
+class PainwrackerOniTriggeredAbility1 extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java
index 61e92e35176..ab43c4bb09a 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/RaggedVeins.java
@@ -84,7 +84,7 @@ public class RaggedVeins extends CardImpl<RaggedVeins> {
     }
 }
 
-class RaggedVeinsTriggeredAbility extends TriggeredAbilityImpl<RaggedVeinsTriggeredAbility> {
+class RaggedVeinsTriggeredAbility extends TriggeredAbilityImpl {
 
     public RaggedVeinsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RaggedVeinsEffect());
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
index 886783204a7..d8d45bad00c 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SeshiroTheAnointed.java
@@ -82,7 +82,7 @@ public class SeshiroTheAnointed extends CardImpl<SeshiroTheAnointed> {
 
 }
 
-class SeshiroTheAnointedAbility extends TriggeredAbilityImpl<SeshiroTheAnointedAbility> {
+class SeshiroTheAnointedAbility extends TriggeredAbilityImpl {
 
     public SeshiroTheAnointedAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java
index 36bffe7b650..2195a6a17ee 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SosukeSonOfSeshiro.java
@@ -86,7 +86,7 @@ public class SosukeSonOfSeshiro extends CardImpl<SosukeSonOfSeshiro> {
     }
 }
 
-class SosukeSonOfSeshiroTriggeredAbility extends TriggeredAbilityImpl<SosukeSonOfSeshiroTriggeredAbility> {
+class SosukeSonOfSeshiroTriggeredAbility extends TriggeredAbilityImpl {
 
     SosukeSonOfSeshiroTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SosukeSonOfSeshiroEffect());
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java b/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java
index 0f920cd6665..514f91b80d5 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/StudentOfElements.java
@@ -77,7 +77,7 @@ public class StudentOfElements extends CardImpl<StudentOfElements> {
     }
 }
 
-class StudentOfElementsHasFlyingAbility extends StateTriggeredAbility<StudentOfElementsHasFlyingAbility> {
+class StudentOfElementsHasFlyingAbility extends StateTriggeredAbility {
 
     public StudentOfElementsHasFlyingAbility() {
         super(Zone.BATTLEFIELD, new FlipSourceEffect(new TobitaMasterOfWinds()));
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java
index 6953ea544c8..b9d19b8686f 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TatsumasaTheDragonsFang.java
@@ -118,7 +118,7 @@ class TatsumaTheDragonsFangEffect extends OneShotEffect<TatsumaTheDragonsFangEff
     }
 }
 
-class TatsumaTheDragonsFangTriggeredAbility extends DelayedTriggeredAbility<TatsumaTheDragonsFangTriggeredAbility> {
+class TatsumaTheDragonsFangTriggeredAbility extends DelayedTriggeredAbility {
 
     protected FixedTarget fixedTarget;
 
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/TideOfWar.java b/Mage.Sets/src/mage/sets/championsofkamigawa/TideOfWar.java
index 34de0e5bd28..1e12f31eef4 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/TideOfWar.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/TideOfWar.java
@@ -71,7 +71,7 @@ public class TideOfWar extends CardImpl<TideOfWar> {
     }
 }
 
-class BlocksTriggeredAbility extends TriggeredAbilityImpl<BlocksTriggeredAbility> {
+class BlocksTriggeredAbility extends TriggeredAbilityImpl {
 
     public BlocksTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java
index be1819268fd..4cc17fe4b9e 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/ZoZuThePunisher.java
@@ -80,7 +80,7 @@ public class ZoZuThePunisher extends CardImpl<ZoZuThePunisher> {
     }
 }
 
-class ZoZuThePunisherAbility extends TriggeredAbilityImpl<ZoZuThePunisherAbility> {
+class ZoZuThePunisherAbility extends TriggeredAbilityImpl {
 
     public ZoZuThePunisherAbility() {
             super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
index 1aed8cbb592..2eda4986e87 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/AdarkarValkyrie.java
@@ -121,7 +121,7 @@ class AdarkarValkyrieEffect extends OneShotEffect<AdarkarValkyrieEffect> {
 }
 
 
-class AdarkarValkyrieDelayedTriggeredAbility extends DelayedTriggeredAbility<AdarkarValkyrieDelayedTriggeredAbility> {
+class AdarkarValkyrieDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     protected FixedTarget fixedTarget;
 
diff --git a/Mage.Sets/src/mage/sets/coldsnap/DarienKingOfKjeldor.java b/Mage.Sets/src/mage/sets/coldsnap/DarienKingOfKjeldor.java
index cfe809dd842..23ca1b0ebc3 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/DarienKingOfKjeldor.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/DarienKingOfKjeldor.java
@@ -73,7 +73,7 @@ public class DarienKingOfKjeldor extends CardImpl<DarienKingOfKjeldor> {
         return new DarienKingOfKjeldor(this);
     }
 }
-class DarienKingOfKjeldorTriggeredAbility extends TriggeredAbilityImpl<DarienKingOfKjeldorTriggeredAbility> {
+class DarienKingOfKjeldorTriggeredAbility extends TriggeredAbilityImpl {
 
     public DarienKingOfKjeldorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DarienKingOfKjeldorEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java b/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java
index 5183e7121d0..56b4919985a 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/DarkDepths.java
@@ -81,7 +81,7 @@ public class DarkDepths extends CardImpl<DarkDepths> {
     }
 }
 
-class DarkDepthsAbility extends StateTriggeredAbility<DarkDepthsAbility> {
+class DarkDepthsAbility extends StateTriggeredAbility {
 
     public DarkDepthsAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java
index 6296d39c825..db895ebf7ad 100644
--- a/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java
+++ b/Mage.Sets/src/mage/sets/coldsnap/FuryOfTheHorde.java
@@ -160,7 +160,7 @@ class FuryOfTheHordeAddPhasesEffect extends OneShotEffect<FuryOfTheHordeAddPhase
 
 }
 
-class DelayedAddMainPhaseAbility extends DelayedTriggeredAbility<DelayedAddMainPhaseAbility> {
+class DelayedAddMainPhaseAbility extends DelayedTriggeredAbility {
 
     private UUID connectedTurnMod;
     private boolean enabled;
diff --git a/Mage.Sets/src/mage/sets/commander/EdricSpymasterOfTrest.java b/Mage.Sets/src/mage/sets/commander/EdricSpymasterOfTrest.java
index ceb020e41be..e86739f44dd 100644
--- a/Mage.Sets/src/mage/sets/commander/EdricSpymasterOfTrest.java
+++ b/Mage.Sets/src/mage/sets/commander/EdricSpymasterOfTrest.java
@@ -73,7 +73,7 @@ public class EdricSpymasterOfTrest extends CardImpl<EdricSpymasterOfTrest> {
     }
 }
 
-class EdricSpymasterOfTrestTriggeredAbility extends TriggeredAbilityImpl<EdricSpymasterOfTrestTriggeredAbility> {
+class EdricSpymasterOfTrestTriggeredAbility extends TriggeredAbilityImpl {
 
     public EdricSpymasterOfTrestTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java b/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java
index 35884ea3bb2..8715bc5f603 100644
--- a/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java
+++ b/Mage.Sets/src/mage/sets/commander/KaaliaOfTheVast.java
@@ -87,7 +87,7 @@ public class KaaliaOfTheVast extends CardImpl<KaaliaOfTheVast> {
 
 }
 
-class KaaliaOfTheVastAttacksAbility extends TriggeredAbilityImpl<KaaliaOfTheVastAttacksAbility> {
+class KaaliaOfTheVastAttacksAbility extends TriggeredAbilityImpl {
 
     public KaaliaOfTheVastAttacksAbility() {
         super(Zone.BATTLEFIELD, new KaaliaOfTheVastEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java
index c1ea1dfdf3f..e193ca9a721 100644
--- a/Mage.Sets/src/mage/sets/commander/SewerNemesis.java
+++ b/Mage.Sets/src/mage/sets/commander/SewerNemesis.java
@@ -149,7 +149,7 @@ class CardsInTargetOpponentsGraveyardCount implements DynamicValue {
     }
 }
 
-class SewerNemesisTriggeredAbility extends TriggeredAbilityImpl<SewerNemesisTriggeredAbility> {
+class SewerNemesisTriggeredAbility extends TriggeredAbilityImpl {
 
     public SewerNemesisTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/commander/VulturousZombie.java b/Mage.Sets/src/mage/sets/commander/VulturousZombie.java
index 09766f318d4..d69dc865c6b 100644
--- a/Mage.Sets/src/mage/sets/commander/VulturousZombie.java
+++ b/Mage.Sets/src/mage/sets/commander/VulturousZombie.java
@@ -78,7 +78,7 @@ public class VulturousZombie extends CardImpl<VulturousZombie> {
     }
 }
 
-class VulturousZombieTriggeredAbility extends TriggeredAbilityImpl<VulturousZombieTriggeredAbility> {
+class VulturousZombieTriggeredAbility extends TriggeredAbilityImpl {
 
     public VulturousZombieTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java
index 40da4eb6f85..d042ae7df47 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfChaos.java
@@ -81,7 +81,7 @@ public class CurseOfChaos extends CardImpl<CurseOfChaos> {
     }
 }
 
-class CurseOfChaosTriggeredAbility extends TriggeredAbilityImpl<CurseOfChaosTriggeredAbility> {
+class CurseOfChaosTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfChaosTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CurseOfChaosEffect(), false); // false because handled in effect
diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java
index 1ef848434cc..bb1b5ef69dc 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfInertia.java
@@ -84,7 +84,7 @@ public class CurseOfInertia extends CardImpl<CurseOfInertia> {
     }
 }
 
-class CurseOfInertiaTriggeredAbility extends TriggeredAbilityImpl<CurseOfInertiaTriggeredAbility> {
+class CurseOfInertiaTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfInertiaTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CurseOfInertiaTapOrUntapTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java
index 461199370c2..749bbef8c93 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfPredation.java
@@ -81,7 +81,7 @@ public class CurseOfPredation extends CardImpl<CurseOfPredation> {
     }
 }
 
-class CurseOfPredationTriggeredAbility extends TriggeredAbilityImpl<CurseOfPredationTriggeredAbility> {
+class CurseOfPredationTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfPredationTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance(), Outcome.BoostCreature), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java
index 9f90a80a30d..9086a091ffd 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfShallowGraves.java
@@ -82,7 +82,7 @@ public class CurseOfShallowGraves extends CardImpl<CurseOfShallowGraves> {
     }
 }
 
-class CurseOfShallowTriggeredAbility extends TriggeredAbilityImpl<CurseOfShallowTriggeredAbility> {
+class CurseOfShallowTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfShallowTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenTargetEffect(new ZombieToken(), new StaticValue(1), true, false), true);
diff --git a/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java b/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java
index 156ea57e031..b912a01ef31 100644
--- a/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java
+++ b/Mage.Sets/src/mage/sets/commander2013/CurseOfTheForsaken.java
@@ -80,7 +80,7 @@ public class CurseOfTheForsaken extends CardImpl<CurseOfTheForsaken> {
     }
 }
 
-class CurseOfTheForsakenTriggeredAbility extends TriggeredAbilityImpl<CurseOfTheForsakenTriggeredAbility> {
+class CurseOfTheForsakenTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfTheForsakenTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java b/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java
index bac6fb97125..50ce82702e3 100644
--- a/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java
+++ b/Mage.Sets/src/mage/sets/commander2013/DereviEmpyrialTactician.java
@@ -128,7 +128,7 @@ class DereviEmpyrialTacticianTriggeredAbility extends TriggeredAbilityImpl {
     }
 }
 
- class DereviEmpyrialTacticianAbility extends ActivatedAbilityImpl<DereviEmpyrialTacticianAbility> {
+ class DereviEmpyrialTacticianAbility extends ActivatedAbilityImpl {
 
     public DereviEmpyrialTacticianAbility() {
         super(Zone.COMMAND, new PutCommanderOnBattlefieldEffect(), new ManaCostsImpl("{1}{G}{W}{U}"));
diff --git a/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java b/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
index ff18555e8ef..2bc3c6a7781 100644
--- a/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
+++ b/Mage.Sets/src/mage/sets/commander2013/EndrekSahrMasterBreeder.java
@@ -87,7 +87,7 @@ public class EndrekSahrMasterBreeder extends CardImpl<EndrekSahrMasterBreeder> {
     }
 }
 
-class EndrekSahrMasterBreederTriggeredAbility extends StateTriggeredAbility<EndrekSahrMasterBreederTriggeredAbility> {
+class EndrekSahrMasterBreederTriggeredAbility extends StateTriggeredAbility {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
     static {
diff --git a/Mage.Sets/src/mage/sets/commander2013/GahijiHonoredOne.java b/Mage.Sets/src/mage/sets/commander2013/GahijiHonoredOne.java
index 49aebf90544..d4b6e163b4a 100644
--- a/Mage.Sets/src/mage/sets/commander2013/GahijiHonoredOne.java
+++ b/Mage.Sets/src/mage/sets/commander2013/GahijiHonoredOne.java
@@ -78,7 +78,7 @@ public class GahijiHonoredOne extends CardImpl<GahijiHonoredOne> {
     }
 }
 
-class GahijiHonoredOneTriggeredAbility extends TriggeredAbilityImpl<GahijiHonoredOneTriggeredAbility> {
+class GahijiHonoredOneTriggeredAbility extends TriggeredAbilityImpl {
 
     public GahijiHonoredOneTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostTargetEffect(2,0, Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/Mirari.java b/Mage.Sets/src/mage/sets/commander2013/Mirari.java
index 3205f6116ef..7a6abbcf36b 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Mirari.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Mirari.java
@@ -71,7 +71,7 @@ public class Mirari extends CardImpl<Mirari> {
 }
 
 
-class MirariTriggeredAbility extends TriggeredAbilityImpl<MirariTriggeredAbility> {
+class MirariTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell filter = new FilterSpell();
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/MysticBarrier.java b/Mage.Sets/src/mage/sets/commander2013/MysticBarrier.java
index 613621d961e..53959b3e5d6 100644
--- a/Mage.Sets/src/mage/sets/commander2013/MysticBarrier.java
+++ b/Mage.Sets/src/mage/sets/commander2013/MysticBarrier.java
@@ -84,7 +84,7 @@ public class MysticBarrier extends CardImpl<MysticBarrier> {
     }
 }
 
-class MysticBarrierTriggeredAbility extends TriggeredAbilityImpl<MysticBarrierTriggeredAbility> {
+class MysticBarrierTriggeredAbility extends TriggeredAbilityImpl {
 
     public MysticBarrierTriggeredAbility() {
         super(Zone.BATTLEFIELD, new MysticBarrierChooseEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/PlagueBoiler.java b/Mage.Sets/src/mage/sets/commander2013/PlagueBoiler.java
index 0d741a2a74c..cd963e7d521 100644
--- a/Mage.Sets/src/mage/sets/commander2013/PlagueBoiler.java
+++ b/Mage.Sets/src/mage/sets/commander2013/PlagueBoiler.java
@@ -111,7 +111,7 @@ class PlagueBoilerEffect extends OneShotEffect<PlagueBoilerEffect> {
     }
 }
 
-class PlagueBoilerTriggeredAbility extends TriggeredAbilityImpl<PlagueBoilerTriggeredAbility> {
+class PlagueBoilerTriggeredAbility extends TriggeredAbilityImpl {
 
     public PlagueBoilerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PlagueBoilerSacrificeDestroyEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java b/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java
index 6dc41918a14..89cdce64d59 100644
--- a/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java
+++ b/Mage.Sets/src/mage/sets/commander2013/Reincarnation.java
@@ -103,7 +103,7 @@ class ReincarnationEffect extends OneShotEffect<ReincarnationEffect> {
     }
 }
 
-class ReincarnationDelayedTriggeredAbility extends DelayedTriggeredAbility<ReincarnationDelayedTriggeredAbility> {
+class ReincarnationDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID target;
 
diff --git a/Mage.Sets/src/mage/sets/commander2013/SunDroplet.java b/Mage.Sets/src/mage/sets/commander2013/SunDroplet.java
index d23d0164554..fd57365db21 100644
--- a/Mage.Sets/src/mage/sets/commander2013/SunDroplet.java
+++ b/Mage.Sets/src/mage/sets/commander2013/SunDroplet.java
@@ -78,7 +78,7 @@ public class SunDroplet extends CardImpl<SunDroplet> {
     }
 }
 
-class SunDropletTriggeredAbility extends TriggeredAbilityImpl<SunDropletTriggeredAbility> {
+class SunDropletTriggeredAbility extends TriggeredAbilityImpl {
 
     public SunDropletTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SunDropletEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java b/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java
index 04fa4310c43..931ec68e479 100644
--- a/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java
+++ b/Mage.Sets/src/mage/sets/commander2013/WidespreadPanic.java
@@ -70,7 +70,7 @@ public class WidespreadPanic extends CardImpl<WidespreadPanic> {
     }
 }
 
-class WidespreadPanicTriggeredAbility extends TriggeredAbilityImpl<WidespreadPanicTriggeredAbility> {
+class WidespreadPanicTriggeredAbility extends TriggeredAbilityImpl {
 
     public WidespreadPanicTriggeredAbility() {
         super(Zone.BATTLEFIELD, new WidespreadPanicEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/conflux/BloodTyrant.java b/Mage.Sets/src/mage/sets/conflux/BloodTyrant.java
index d51d4ec3cac..cb0f6053d54 100644
--- a/Mage.Sets/src/mage/sets/conflux/BloodTyrant.java
+++ b/Mage.Sets/src/mage/sets/conflux/BloodTyrant.java
@@ -90,7 +90,7 @@ public class BloodTyrant extends CardImpl<BloodTyrant> {
     }
 }
 
-class PlayerLosesTheGameTriggeredAbility extends TriggeredAbilityImpl<PlayerLosesTheGameTriggeredAbility> {
+class PlayerLosesTheGameTriggeredAbility extends TriggeredAbilityImpl {
 
     public PlayerLosesTheGameTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(5)), false);
diff --git a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java
index 0fc9c86ad98..880927fa44a 100644
--- a/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java
+++ b/Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java
@@ -74,7 +74,7 @@ public class BloodhallOoze extends CardImpl<BloodhallOoze> {
 
 }
 
-class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl<BloodhallOozeTriggeredAbility1> {
+class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterPermanent();
 
@@ -114,7 +114,7 @@ class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl<BloodhallOozeT
     }
 }
 
-class BloodhallOozeTriggeredAbility2 extends TriggeredAbilityImpl<BloodhallOozeTriggeredAbility2> {
+class BloodhallOozeTriggeredAbility2 extends TriggeredAbilityImpl {
 
     private static final FilterControlledPermanent filter = new FilterControlledPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/conflux/CorruptedRoots.java b/Mage.Sets/src/mage/sets/conflux/CorruptedRoots.java
index 753b78f18b9..6709f94325c 100644
--- a/Mage.Sets/src/mage/sets/conflux/CorruptedRoots.java
+++ b/Mage.Sets/src/mage/sets/conflux/CorruptedRoots.java
@@ -92,7 +92,7 @@ public class CorruptedRoots extends CardImpl<CorruptedRoots> {
     }
 }
 
-class CorruptedRootsTriggeredAbility extends TriggeredAbilityImpl<CorruptedRootsTriggeredAbility> {
+class CorruptedRootsTriggeredAbility extends TriggeredAbilityImpl {
 
     CorruptedRootsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java
index 3bc183c6dac..23dfe464482 100644
--- a/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java
+++ b/Mage.Sets/src/mage/sets/conflux/FontOfMythos.java
@@ -64,7 +64,7 @@ public class FontOfMythos extends CardImpl<FontOfMythos> {
 
 }
 
-class FontOfMythosAbility extends TriggeredAbilityImpl<FontOfMythosAbility> {
+class FontOfMythosAbility extends TriggeredAbilityImpl {
 
     public FontOfMythosAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/conflux/KederektParasite.java b/Mage.Sets/src/mage/sets/conflux/KederektParasite.java
index fdb03467ca4..2117076f500 100644
--- a/Mage.Sets/src/mage/sets/conflux/KederektParasite.java
+++ b/Mage.Sets/src/mage/sets/conflux/KederektParasite.java
@@ -70,7 +70,7 @@ public class KederektParasite extends CardImpl<KederektParasite> {
     }
 }
 
-class KederektParasiteTriggeredAbility extends TriggeredAbilityImpl<KederektParasiteTriggeredAbility> {
+class KederektParasiteTriggeredAbility extends TriggeredAbilityImpl {
 
     KederektParasiteTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1, false, "opponent"), true);
diff --git a/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java b/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java
index 77bb4b2fe2c..ca838134577 100644
--- a/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java
+++ b/Mage.Sets/src/mage/sets/conflux/ParasiticStrix.java
@@ -76,7 +76,7 @@ public class ParasiticStrix extends CardImpl<ParasiticStrix> {
     }
 }
 
-class ParasiticStrixTriggeredAbility extends TriggeredAbilityImpl<ParasiticStrixTriggeredAbility> {
+class ParasiticStrixTriggeredAbility extends TriggeredAbilityImpl {
 
     public ParasiticStrixTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java
index 1833b37d354..6f86e1893d7 100644
--- a/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java
+++ b/Mage.Sets/src/mage/sets/conflux/QuenchableFire.java
@@ -108,7 +108,7 @@ class QuenchableFireEffect extends OneShotEffect<QuenchableFireEffect> {
 
 }
 
-class QuenchableFireDelayedTriggeredAbility extends DelayedTriggeredAbility<QuenchableFireDelayedTriggeredAbility> {
+class QuenchableFireDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID specialActionId;
 
diff --git a/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java b/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java
index aac3a24c71a..a0383447887 100644
--- a/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java
+++ b/Mage.Sets/src/mage/sets/conflux/SludgeStrider.java
@@ -84,7 +84,7 @@ public class SludgeStrider extends CardImpl<SludgeStrider> {
     }
 }
 
-class SludgeStriderTriggeredAbility extends TriggeredAbilityImpl<SludgeStriderTriggeredAbility> {
+class SludgeStriderTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterArtifactCard filter = new FilterArtifactCard("another artifact under your control");
     static {
diff --git a/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java b/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java
index eb618784451..80f33a0bbf5 100644
--- a/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java
+++ b/Mage.Sets/src/mage/sets/darkascension/AvacynsCollar.java
@@ -78,7 +78,7 @@ public class AvacynsCollar extends CardImpl<AvacynsCollar> {
     }
 }
 
-class AvacynsCollarTriggeredAbility extends TriggeredAbilityImpl<AvacynsCollarTriggeredAbility> {
+class AvacynsCollarTriggeredAbility extends TriggeredAbilityImpl {
 
     public AvacynsCollarTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new SpiritWhiteToken()));
diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java
index 218ef6644a6..b7e54855ade 100644
--- a/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java
+++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfEchoes.java
@@ -86,7 +86,7 @@ public class CurseOfEchoes extends CardImpl<CurseOfEchoes> {
     }
 }
 
-class CurseOfEchoesCopyTriggeredAbility extends TriggeredAbilityImpl<CurseOfEchoesCopyTriggeredAbility> {
+class CurseOfEchoesCopyTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell filter = new FilterSpell();
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java
index c30dcc7b265..bc06d9f4a81 100644
--- a/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java
+++ b/Mage.Sets/src/mage/sets/darkascension/CurseOfThirst.java
@@ -82,7 +82,7 @@ public class CurseOfThirst extends CardImpl<CurseOfThirst> {
     }
 }
 
-class CurseOfThirstAbility extends TriggeredAbilityImpl<CurseOfThirstAbility> {
+class CurseOfThirstAbility extends TriggeredAbilityImpl {
 
     public CurseOfThirstAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(new CursesAttachedCount()));
diff --git a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java
index a72d85bd90e..f088bc69297 100644
--- a/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java
+++ b/Mage.Sets/src/mage/sets/darkascension/DiregrafCaptain.java
@@ -88,7 +88,7 @@ public class DiregrafCaptain extends CardImpl<DiregrafCaptain> {
     }
 }
 
-class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl<DiregrafCaptainTriggeredAbility> {
+class DiregrafCaptainTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Zombie");
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java
index 8afc7532d3a..1bf98d22da2 100644
--- a/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java
+++ b/Mage.Sets/src/mage/sets/darkascension/DrogskolReaver.java
@@ -74,7 +74,7 @@ public class DrogskolReaver extends CardImpl<DrogskolReaver> {
     }
 }
 
-class DrogskolReaverAbility extends TriggeredAbilityImpl<DrogskolReaverAbility> {
+class DrogskolReaverAbility extends TriggeredAbilityImpl {
 
     public DrogskolReaverAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
index 2af61123ba6..dc28f1cb9da 100644
--- a/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
+++ b/Mage.Sets/src/mage/sets/darkascension/FlayerOfTheHatebound.java
@@ -80,7 +80,7 @@ public class FlayerOfTheHatebound extends CardImpl<FlayerOfTheHatebound> {
     }
 }
 
-class FlayerTriggeredAbility extends TriggeredAbilityImpl<FlayerTriggeredAbility> {
+class FlayerTriggeredAbility extends TriggeredAbilityImpl {
 
     public FlayerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new FlayerEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
index 665d851ce9a..30009a55ba5 100644
--- a/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
+++ b/Mage.Sets/src/mage/sets/darkascension/HavengulLich.java
@@ -156,7 +156,7 @@ class HavengulLichPlayedEffect extends OneShotEffect<HavengulLichPlayedEffect> {
 }
 
 // when card is played create continuous effect
-class HavengulLichDelayedTriggeredAbility extends DelayedTriggeredAbility<HavengulLichDelayedTriggeredAbility> {
+class HavengulLichDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID cardId;
 
diff --git a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java
index d4da2c8c668..0049d6b9bee 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Hellrider.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Hellrider.java
@@ -71,7 +71,7 @@ public class Hellrider extends CardImpl<Hellrider> {
     }
 }
 
-class HellriderTriggeredAbility extends TriggeredAbilityImpl<HellriderTriggeredAbility> {
+class HellriderTriggeredAbility extends TriggeredAbilityImpl {
 
     public HellriderTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java
index d9e31790878..e0626d96911 100644
--- a/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java
+++ b/Mage.Sets/src/mage/sets/darkascension/HuntmasterOfTheFells.java
@@ -100,7 +100,7 @@ public class HuntmasterOfTheFells extends CardImpl<HuntmasterOfTheFells> {
     }
 }
 
-class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl<HuntmasterOfTheFellsAbility> {
+class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl {
 
     public HuntmasterOfTheFellsAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken(Token.Type.SECOND)), false);
@@ -137,7 +137,7 @@ class HuntmasterOfTheFellsAbility extends TriggeredAbilityImpl<HuntmasterOfTheFe
 
 }
 
-class RavagerOfTheFellsAbility extends TriggeredAbilityImpl<RavagerOfTheFellsAbility> {
+class RavagerOfTheFellsAbility extends TriggeredAbilityImpl {
 
     public RavagerOfTheFellsAbility() {
         super(Zone.BATTLEFIELD, new RavagerOfTheFellsEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java
index 7f026ea6e81..46d58b12027 100644
--- a/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java
+++ b/Mage.Sets/src/mage/sets/darkascension/JarOfEyeballs.java
@@ -85,7 +85,7 @@ public class JarOfEyeballs extends CardImpl<JarOfEyeballs> {
     }
 }
 
-class JarOfEyeballsTriggeredAbility extends TriggeredAbilityImpl<JarOfEyeballsTriggeredAbility> {
+class JarOfEyeballsTriggeredAbility extends TriggeredAbilityImpl {
 
     public JarOfEyeballsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.EYEBALL.createInstance(2)));
diff --git a/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java b/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java
index 9ff6e7fc766..013da4f8528 100644
--- a/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java
+++ b/Mage.Sets/src/mage/sets/darkascension/LostInTheWoods.java
@@ -116,7 +116,7 @@ class LostInTheWoodsEffect extends OneShotEffect<LostInTheWoodsEffect> {
 
 }
 
-class LostInTheWoodsTriggeredAbility extends TriggeredAbilityImpl<LostInTheWoodsTriggeredAbility> {
+class LostInTheWoodsTriggeredAbility extends TriggeredAbilityImpl {
 
     public LostInTheWoodsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LostInTheWoodsEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java b/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java
index 702d684abb6..532e005f71b 100644
--- a/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java
+++ b/Mage.Sets/src/mage/sets/darkascension/MikaeusTheUnhallowed.java
@@ -90,7 +90,7 @@ public class MikaeusTheUnhallowed extends CardImpl<MikaeusTheUnhallowed> {
     }
 }
 
-class MikaeusTheUnhallowedAbility extends TriggeredAbilityImpl<MikaeusTheUnhallowedAbility> {
+class MikaeusTheUnhallowedAbility extends TriggeredAbilityImpl {
 
     public MikaeusTheUnhallowedAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java b/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java
index 8da4db01b4a..247173d2b0c 100644
--- a/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java
+++ b/Mage.Sets/src/mage/sets/darkascension/Shriekgeist.java
@@ -72,7 +72,7 @@ public class Shriekgeist extends CardImpl<Shriekgeist> {
     }
 }
 
-class ShriekgeistTriggeredAbility extends TriggeredAbilityImpl<ShriekgeistTriggeredAbility> {
+class ShriekgeistTriggeredAbility extends TriggeredAbilityImpl {
 
     public ShriekgeistTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
index 084ea969c63..01b3ea0da07 100644
--- a/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
+++ b/Mage.Sets/src/mage/sets/darkascension/SoulSeizer.java
@@ -84,7 +84,7 @@ public class SoulSeizer extends CardImpl<SoulSeizer> {
     }
 }
 
-class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl<SoulSeizerTriggeredAbility> {
+class SoulSeizerTriggeredAbility extends TriggeredAbilityImpl {
 
     public SoulSeizerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SoulSeizerEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java
index 6d01b47a790..db7b35036cc 100644
--- a/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java
+++ b/Mage.Sets/src/mage/sets/darkascension/SpitefulShadows.java
@@ -78,7 +78,7 @@ public class SpitefulShadows extends CardImpl<SpitefulShadows> {
     }
 }
 
-class SpitefulShadowsTriggeredAbility extends TriggeredAbilityImpl<SpitefulShadowsTriggeredAbility> {
+class SpitefulShadowsTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpitefulShadowsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SpitefulShadowsEffect());
diff --git a/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java b/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java
index 89eb59c79de..2588f772ee4 100644
--- a/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java
+++ b/Mage.Sets/src/mage/sets/darkascension/TovolarsMagehunter.java
@@ -84,7 +84,7 @@ public class TovolarsMagehunter extends CardImpl<TovolarsMagehunter> {
     }
 }
 
-class TovolarsMagehunterTriggeredAbility extends TriggeredAbilityImpl<TovolarsMagehunterTriggeredAbility> {
+class TovolarsMagehunterTriggeredAbility extends TriggeredAbilityImpl {
 
     public TovolarsMagehunterTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
index 605f26380cb..cf0888e6f34 100644
--- a/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
+++ b/Mage.Sets/src/mage/sets/darkascension/WerewolfRansacker.java
@@ -88,7 +88,7 @@ public class WerewolfRansacker extends CardImpl<WerewolfRansacker> {
     }
 }
 
-class WerewolfRansackerAbility extends TriggeredAbilityImpl<WerewolfRansackerAbility> {
+class WerewolfRansackerAbility extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterPermanent("artifact");
     public static final String RULE_TEXT = "Whenever this creature transforms into Werewolf Ransacker, you may destroy target artifact. If that artifact is put into a graveyard this way, Werewolf Ransacker deals 3 damage to that artifact's controller";
diff --git a/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java b/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java
index 5eb19613aa2..ca841dc4f90 100644
--- a/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java
+++ b/Mage.Sets/src/mage/sets/darkascension/WithengarUnbound.java
@@ -80,7 +80,7 @@ public class WithengarUnbound extends CardImpl<WithengarUnbound> {
     }
 }
 
-class WithengarUnboundTriggeredAbility extends TriggeredAbilityImpl<WithengarUnboundTriggeredAbility> {
+class WithengarUnboundTriggeredAbility extends TriggeredAbilityImpl {
 
     public WithengarUnboundTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance(13)), false);
diff --git a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
index 94d63ea9654..353620497d6 100644
--- a/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
+++ b/Mage.Sets/src/mage/sets/darkascension/WolfhuntersQuiver.java
@@ -84,7 +84,7 @@ public class WolfhuntersQuiver extends CardImpl<WolfhuntersQuiver> {
     }
 }
 
-class WolfhuntersQuiverAbility extends ActivatedAbilityImpl<WolfhuntersQuiverAbility> {
+class WolfhuntersQuiverAbility extends ActivatedAbilityImpl {
 
     private String ruleText;
 
diff --git a/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java b/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java
index b1926fdc7f6..8544d9f7838 100644
--- a/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java
+++ b/Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java
@@ -72,7 +72,7 @@ public class DarksteelReactor extends CardImpl<DarksteelReactor> {
     }
 }
 
-class DarksteelReactorStateTriggeredAbility extends StateTriggeredAbility<DarksteelReactorStateTriggeredAbility> {
+class DarksteelReactorStateTriggeredAbility extends StateTriggeredAbility {
 
     public DarksteelReactorStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new WinGameEffect());
diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java
index 591c83acaf7..79f2ebec812 100644
--- a/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java
+++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfFireAndIce.java
@@ -90,7 +90,7 @@ public class SwordOfFireAndIce extends CardImpl<SwordOfFireAndIce> {
 
 }
 
-class SwordOfFireAndIceAbility extends TriggeredAbilityImpl<SwordOfFireAndIceAbility> {
+class SwordOfFireAndIceAbility extends TriggeredAbilityImpl {
 
     public SwordOfFireAndIceAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java
index dc71d1365c9..99bdf5db3bd 100644
--- a/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java
+++ b/Mage.Sets/src/mage/sets/darksteel/SwordOfLightAndShadow.java
@@ -94,7 +94,7 @@ public class SwordOfLightAndShadow extends CardImpl<SwordOfLightAndShadow> {
 
 }
 
-class SwordOfLightAndShadowAbility extends TriggeredAbilityImpl<SwordOfLightAndShadowAbility> {
+class SwordOfLightAndShadowAbility extends TriggeredAbilityImpl {
 
     public SwordOfLightAndShadowAbility() {
         super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/dissension/ProperBurial.java b/Mage.Sets/src/mage/sets/dissension/ProperBurial.java
index e88abf3dbaa..bb17c28cacf 100644
--- a/Mage.Sets/src/mage/sets/dissension/ProperBurial.java
+++ b/Mage.Sets/src/mage/sets/dissension/ProperBurial.java
@@ -65,7 +65,7 @@ public class ProperBurial extends CardImpl<ProperBurial> {
     }
 }
 
-class ProperBurialTriggeredAbility extends TriggeredAbilityImpl<ProperBurialTriggeredAbility> {
+class ProperBurialTriggeredAbility extends TriggeredAbilityImpl {
 
     public ProperBurialTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
index 14981505708..bc796cd7db5 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
@@ -83,7 +83,7 @@ public class BeckCall extends SplitCard<BeckCall> {
     }
 }
 
-class BeckTriggeredAbility extends DelayedTriggeredAbility<BeckTriggeredAbility> {
+class BeckTriggeredAbility extends DelayedTriggeredAbility {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java
index d29f3fe2473..75920db8bcc 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BlazeCommando.java
@@ -80,7 +80,7 @@ public class BlazeCommando extends CardImpl<BlazeCommando> {
     }
 
 }
-class BlazeCommandoTriggeredAbility extends TriggeredAbilityImpl<BlazeCommandoTriggeredAbility> {
+class BlazeCommandoTriggeredAbility extends TriggeredAbilityImpl {
 
     private List<UUID> handledStackObjects = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BredForTheHunt.java b/Mage.Sets/src/mage/sets/dragonsmaze/BredForTheHunt.java
index 6bd12d53b81..82d06ca6ebe 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BredForTheHunt.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BredForTheHunt.java
@@ -69,7 +69,7 @@ public class BredForTheHunt extends CardImpl<BredForTheHunt> {
     }
 }
 
-class BredForTheHuntTriggeredAbility extends TriggeredAbilityImpl<BredForTheHuntTriggeredAbility> {
+class BredForTheHuntTriggeredAbility extends TriggeredAbilityImpl {
 
     public BredForTheHuntTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CarnageGladiator.java b/Mage.Sets/src/mage/sets/dragonsmaze/CarnageGladiator.java
index 9da35cb3475..f0c90fc98c6 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/CarnageGladiator.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/CarnageGladiator.java
@@ -84,7 +84,7 @@ public class CarnageGladiator extends CardImpl<CarnageGladiator> {
 
 }
 
-class CarnageGladiatorTriggeredAbility extends TriggeredAbilityImpl<CarnageGladiatorTriggeredAbility> {
+class CarnageGladiatorTriggeredAbility extends TriggeredAbilityImpl {
 
     public CarnageGladiatorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java b/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java
index d2fb776f9b7..9235203dabc 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/MasterOfCruelties.java
@@ -87,7 +87,7 @@ public class MasterOfCruelties extends CardImpl<MasterOfCruelties> {
     }
 }
 
-class MasterOfCrueltiesTriggeredAbility extends TriggeredAbilityImpl<MasterOfCrueltiesTriggeredAbility> {
+class MasterOfCrueltiesTriggeredAbility extends TriggeredAbilityImpl {
 
     public MasterOfCrueltiesTriggeredAbility() {
         super(Zone.BATTLEFIELD, new MasterOfCrueltiesEffect());
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java b/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java
index 127f667c62f..1340f7c4604 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/MelekIzzetParagon.java
@@ -95,7 +95,7 @@ public class MelekIzzetParagon extends CardImpl<MelekIzzetParagon> {
     }
 }
 
-class MelekIzzetParagonTriggeredAbility extends TriggeredAbilityImpl<MelekIzzetParagonTriggeredAbility> {
+class MelekIzzetParagonTriggeredAbility extends TriggeredAbilityImpl {
 
     public MelekIzzetParagonTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java b/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java
index 5c9bab8b0a2..a449c90b61b 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/PossibilityStorm.java
@@ -81,7 +81,7 @@ public class PossibilityStorm extends CardImpl<PossibilityStorm> {
 }
 
 
-class PossibilityStormTriggeredAbility extends TriggeredAbilityImpl<PossibilityStormTriggeredAbility> {
+class PossibilityStormTriggeredAbility extends TriggeredAbilityImpl {
 
     public PossibilityStormTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PossibilityStormEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java
index 115be381990..8e445b90d62 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/PyrewildShaman.java
@@ -85,7 +85,7 @@ public class PyrewildShaman extends CardImpl<PyrewildShaman> {
 
 }
 
-class PyrewildShamanTriggeredAbility extends TriggeredAbilityImpl<PyrewildShamanTriggeredAbility> {
+class PyrewildShamanTriggeredAbility extends TriggeredAbilityImpl {
 
     List<UUID> damagedPlayerIds = new ArrayList<UUID>();
 
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java
index 28e34cc1534..e1fcd4f6ef0 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/RenegadeKrasis.java
@@ -80,7 +80,7 @@ public class RenegadeKrasis extends CardImpl<RenegadeKrasis> {
 
 }
 
-class RenegadeKrasisTriggeredAbility extends TriggeredAbilityImpl<RenegadeKrasisTriggeredAbility> {
+class RenegadeKrasisTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
     static {
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java b/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java
index 50a7151f18a..c625d9ead9a 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/RuricTharTheUnbowed.java
@@ -86,7 +86,7 @@ public class RuricTharTheUnbowed extends CardImpl<RuricTharTheUnbowed> {
     }
 }
 
-class RuricTharTheUnbowedAbility extends TriggeredAbilityImpl<RuricTharTheUnbowedAbility> {
+class RuricTharTheUnbowedAbility extends TriggeredAbilityImpl {
 
     public RuricTharTheUnbowedAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(6), false);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java b/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java
index f3735c739dd..5c50da43350 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/TeysaEnvoyOfGhosts.java
@@ -85,7 +85,7 @@ public class TeysaEnvoyOfGhosts extends CardImpl<TeysaEnvoyOfGhosts> {
     }
 }
 
-class TeysaEnvoyOfGhostsTriggeredAbility extends TriggeredAbilityImpl<TeysaEnvoyOfGhostsTriggeredAbility> {
+class TeysaEnvoyOfGhostsTriggeredAbility extends TriggeredAbilityImpl {
 
     public TeysaEnvoyOfGhostsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java
index 9a00ab30810..7640e0d68df 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/VoiceOfResurgence.java
@@ -80,7 +80,7 @@ public class VoiceOfResurgence extends CardImpl<VoiceOfResurgence> {
     }
 }
 
-class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl<VoiceOfResurgenceTriggeredAbility> {
+class VoiceOfResurgenceTriggeredAbility extends TriggeredAbilityImpl {
 
     public VoiceOfResurgenceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new VoiceOfResurgenceToken()), false);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java
index 85702d4ec32..ad0d0bb1991 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ZhurTaaDruid.java
@@ -74,7 +74,7 @@ public class ZhurTaaDruid extends CardImpl<ZhurTaaDruid> {
     }
 }
 
-class ZhurTaaDruidAbility extends TriggeredAbilityImpl<ZhurTaaDruidAbility> {
+class ZhurTaaDruidAbility extends TriggeredAbilityImpl {
 
     public ZhurTaaDruidAbility() {
         super(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT));
diff --git a/Mage.Sets/src/mage/sets/elspethvstezzeret/SynodCenturion.java b/Mage.Sets/src/mage/sets/elspethvstezzeret/SynodCenturion.java
index ecf92e6f11f..2e2b2a1edd3 100644
--- a/Mage.Sets/src/mage/sets/elspethvstezzeret/SynodCenturion.java
+++ b/Mage.Sets/src/mage/sets/elspethvstezzeret/SynodCenturion.java
@@ -66,7 +66,7 @@ public class SynodCenturion extends CardImpl<SynodCenturion> {
         return new SynodCenturion(this);
     }
 
-    class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility<SynodCenturionStateTriggeredAbility> {
+    class SynodCenturionStateTriggeredAbility extends StateTriggeredAbility {
 
         public SynodCenturionStateTriggeredAbility() {
             super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
index 8e684d6e3cc..8424adc2148 100644
--- a/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
+++ b/Mage.Sets/src/mage/sets/eventide/AshlingTheExtinguisher.java
@@ -74,7 +74,7 @@ public class AshlingTheExtinguisher extends CardImpl<AshlingTheExtinguisher> {
 
 }
 
-class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl<AshlingTheExtinguisherTriggeredAbility> {
+class AshlingTheExtinguisherTriggeredAbility extends TriggeredAbilityImpl {
     public AshlingTheExtinguisherTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeTargetEffect());
         this.addTarget(new TargetCreaturePermanent());
diff --git a/Mage.Sets/src/mage/sets/eventide/Necroskitter.java b/Mage.Sets/src/mage/sets/eventide/Necroskitter.java
index 299e2f17aa9..94a93905eac 100644
--- a/Mage.Sets/src/mage/sets/eventide/Necroskitter.java
+++ b/Mage.Sets/src/mage/sets/eventide/Necroskitter.java
@@ -77,7 +77,7 @@ public class Necroskitter extends CardImpl<Necroskitter> {
     }
 }
 
-class NecroskitterTriggeredAbility extends TriggeredAbilityImpl<NecroskitterTriggeredAbility> {
+class NecroskitterTriggeredAbility extends TriggeredAbilityImpl {
 
     public NecroskitterTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ReturnToBattlefieldUnderYourControlTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/eventide/Spitemare.java b/Mage.Sets/src/mage/sets/eventide/Spitemare.java
index edc51a872ab..05f512d30d8 100644
--- a/Mage.Sets/src/mage/sets/eventide/Spitemare.java
+++ b/Mage.Sets/src/mage/sets/eventide/Spitemare.java
@@ -75,7 +75,7 @@ public class Spitemare extends CardImpl<Spitemare> {
     }
 }
 
-class SpitemareTriggeredAbility extends TriggeredAbilityImpl<SpitemareTriggeredAbility> {
+class SpitemareTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpitemareTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SpitemareEffect());
diff --git a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java
index f071c6d6fb5..2e8ffa1ed96 100644
--- a/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java
+++ b/Mage.Sets/src/mage/sets/eventide/WakeThrasher.java
@@ -72,7 +72,7 @@ public class WakeThrasher extends CardImpl<WakeThrasher> {
     }
 }
 
-class BecomesUntappedControlledPermanentTriggeredAbility extends TriggeredAbilityImpl<BecomesUntappedControlledPermanentTriggeredAbility>{
+class BecomesUntappedControlledPermanentTriggeredAbility extends TriggeredAbilityImpl{
 
     public BecomesUntappedControlledPermanentTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java b/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java
index c980abe4f8b..8bac9ac9230 100644
--- a/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java
+++ b/Mage.Sets/src/mage/sets/exodus/CityOfTraitors.java
@@ -69,7 +69,7 @@ public class CityOfTraitors extends CardImpl<CityOfTraitors> {
     }
 }
 
-class CityOfTraitorsTriggeredAbility extends TriggeredAbilityImpl<CityOfTraitorsTriggeredAbility> {
+class CityOfTraitorsTriggeredAbility extends TriggeredAbilityImpl {
 
     CityOfTraitorsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
index f0ba6c0737e..741ba65f01c 100644
--- a/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
+++ b/Mage.Sets/src/mage/sets/exodus/SoltariVisionary.java
@@ -77,7 +77,7 @@ public class SoltariVisionary extends CardImpl<SoltariVisionary> {
     }
 }
 
-class SoltariVisionaryTriggeredAbility extends TriggeredAbilityImpl<SoltariVisionaryTriggeredAbility> {
+class SoltariVisionaryTriggeredAbility extends TriggeredAbilityImpl {
 
     SoltariVisionaryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
index e4a37ffef08..db3eb4bc511 100644
--- a/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
+++ b/Mage.Sets/src/mage/sets/fallenempires/Seasinger.java
@@ -106,7 +106,7 @@ public class Seasinger extends CardImpl<Seasinger> {
     }
 }
 
-class SeasingerTriggeredAbility extends StateTriggeredAbility<SeasingerTriggeredAbility> {
+class SeasingerTriggeredAbility extends StateTriggeredAbility {
 
     public SeasingerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java
index 149f7b50651..5284abd363f 100644
--- a/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java
+++ b/Mage.Sets/src/mage/sets/fifthdawn/BlindCreeper.java
@@ -71,7 +71,7 @@ public class BlindCreeper extends CardImpl<BlindCreeper> {
     }
 }
 
-class BlindCreeperAbility extends TriggeredAbilityImpl<BlindCreeperAbility> {
+class BlindCreeperAbility extends TriggeredAbilityImpl {
 
     public BlindCreeperAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(-1, -1, Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Blight.java b/Mage.Sets/src/mage/sets/fifthedition/Blight.java
index 9dc9ed1c6ea..151b43467a8 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Blight.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Blight.java
@@ -81,7 +81,7 @@ public class Blight extends CardImpl<Blight> {
     }
 }
 
-class BlightTriggeredAbility extends TriggeredAbilityImpl<BlightTriggeredAbility> {
+class BlightTriggeredAbility extends TriggeredAbilityImpl {
     BlightTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Dandan.java b/Mage.Sets/src/mage/sets/fifthedition/Dandan.java
index 1758fca0c6e..1c742012e3d 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Dandan.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Dandan.java
@@ -114,7 +114,7 @@ class DandanEffect extends ReplacementEffectImpl<DandanEffect> {
     }
 }
 
-class DandanTriggeredAbility extends StateTriggeredAbility<DandanTriggeredAbility> {
+class DandanTriggeredAbility extends StateTriggeredAbility {
 
     public DandanTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/fifthedition/Justice.java b/Mage.Sets/src/mage/sets/fifthedition/Justice.java
index c469b14c6f9..3a8e757c689 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Justice.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Justice.java
@@ -75,7 +75,7 @@ public class Justice extends CardImpl<Justice> {
     }
 }
 
-class JusticeTriggeredAbility extends TriggeredAbilityImpl<JusticeTriggeredAbility> {
+class JusticeTriggeredAbility extends TriggeredAbilityImpl {
 
     public JusticeTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/fourthedition/TheRack.java b/Mage.Sets/src/mage/sets/fourthedition/TheRack.java
index fa2cac2a0c2..e9c47eed39c 100644
--- a/Mage.Sets/src/mage/sets/fourthedition/TheRack.java
+++ b/Mage.Sets/src/mage/sets/fourthedition/TheRack.java
@@ -69,7 +69,7 @@ public class TheRack extends CardImpl<TheRack> {
     }
 }
 
-class TheRackTriggeredAbility extends TriggeredAbilityImpl<TheRackTriggeredAbility> {
+class TheRackTriggeredAbility extends TriggeredAbilityImpl {
 
 
     public TheRackTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java b/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java
index 4b633f98b89..53048de7050 100644
--- a/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java
+++ b/Mage.Sets/src/mage/sets/futuresight/BridgeFromBelow.java
@@ -87,7 +87,7 @@ public class BridgeFromBelow extends CardImpl<BridgeFromBelow> {
     }
 }
 
-class BridgeFromBelowAbility extends TriggeredAbilityImpl<BridgeFromBelowAbility> {
+class BridgeFromBelowAbility extends TriggeredAbilityImpl {
 
     protected FilterCreaturePermanent filter;
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
index 36110cfb3d0..bc95e8a00b3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AureliaTheWarleader.java
@@ -89,7 +89,7 @@ public class AureliaTheWarleader extends CardImpl<AureliaTheWarleader> {
     }
 }
 
-class AureliaAttacksTriggeredAbility extends TriggeredAbilityImpl<AureliaAttacksTriggeredAbility> {
+class AureliaAttacksTriggeredAbility extends TriggeredAbilityImpl {
 
     protected String text;
 
diff --git a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java
index 838b9ed6d06..97c5a7fd9b7 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/DuskmantleGuildmage.java
@@ -86,7 +86,7 @@ public class DuskmantleGuildmage extends CardImpl<DuskmantleGuildmage> {
     }
 }
 
-class CardPutIntoOpponentGraveThisTurn extends DelayedTriggeredAbility<CardPutIntoOpponentGraveThisTurn> {
+class CardPutIntoOpponentGraveThisTurn extends DelayedTriggeredAbility {
 
     public CardPutIntoOpponentGraveThisTurn() {
         super(new LoseLifeTargetEffect(1), Duration.EndOfTurn, false);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
index 0dd6e3187f7..f93fee7a1f0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FathomMage.java
@@ -78,7 +78,7 @@ public class FathomMage extends CardImpl<FathomMage> {
 }
 
 
-class FathomMageTriggeredAbility extends TriggeredAbilityImpl<FathomMageTriggeredAbility> {
+class FathomMageTriggeredAbility extends TriggeredAbilityImpl {
 
     public FathomMageTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
index e42e9c40b16..9937c3efaf3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/FiveAlarmFire.java
@@ -77,7 +77,7 @@ public class FiveAlarmFire extends CardImpl<FiveAlarmFire> {
 }
 
 
-class FiveAlarmFireTriggeredAbility extends TriggeredAbilityImpl<FiveAlarmFireTriggeredAbility> {
+class FiveAlarmFireTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
     
diff --git a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
index b4ac7ebb332..80f1f29c3d3 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/GruulRagebeast.java
@@ -87,7 +87,7 @@ public class GruulRagebeast extends CardImpl<GruulRagebeast> {
     }
 }
 
-class GruulRagebeastTriggeredAbility extends TriggeredAbilityImpl<GruulRagebeastTriggeredAbility> {
+class GruulRagebeastTriggeredAbility extends TriggeredAbilityImpl {
 
     GruulRagebeastTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GruulRagebeastEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
index 1a1c5b07f5a..b4c595520e7 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/HighPriestOfPenance.java
@@ -73,7 +73,7 @@ public class HighPriestOfPenance extends CardImpl<HighPriestOfPenance> {
     }
 }
 
-class HighPriestOfPenanceTriggeredAbility extends TriggeredAbilityImpl<HighPriestOfPenanceTriggeredAbility> {
+class HighPriestOfPenanceTriggeredAbility extends TriggeredAbilityImpl {
 
 
     public HighPriestOfPenanceTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java b/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java
index c2591ea1e51..bad3cb0c20c 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/IllusionistsBracers.java
@@ -74,7 +74,7 @@ public class IllusionistsBracers extends CardImpl<IllusionistsBracers> {
     }
 }
 
-class AbilityActivatedTriggeredAbility extends TriggeredAbilityImpl<AbilityActivatedTriggeredAbility> {
+class AbilityActivatedTriggeredAbility extends TriggeredAbilityImpl {
     AbilityActivatedTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CopyActivatedAbilityEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
index 9d5ec6b28d8..f6fec7f32c0 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/IncursionSpecialist.java
@@ -71,7 +71,7 @@ public class IncursionSpecialist extends CardImpl<IncursionSpecialist> {
     }
 }
 
-class IncursionTriggeredAbility extends TriggeredAbilityImpl<IncursionTriggeredAbility> {
+class IncursionTriggeredAbility extends TriggeredAbilityImpl {
 
     public IncursionTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn));
diff --git a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
index 2a27dffbc65..c920ba58209 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/LazavDimirMastermind.java
@@ -83,7 +83,7 @@ public class LazavDimirMastermind extends CardImpl<LazavDimirMastermind> {
     }
 }
 
-class CreatureCardPutOpponentGraveyardTriggeredAbility extends TriggeredAbilityImpl<CreatureCardPutOpponentGraveyardTriggeredAbility> {
+class CreatureCardPutOpponentGraveyardTriggeredAbility extends TriggeredAbilityImpl {
 
     public CreatureCardPutOpponentGraveyardTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LazavDimirEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
index 2b6ee817766..874626e7ee5 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/LeylinePhantom.java
@@ -72,7 +72,7 @@ public class LeylinePhantom extends CardImpl<LeylinePhantom> {
 }
 
 
-class LeylinePhantomTriggeredAbility extends TriggeredAbilityImpl<LeylinePhantomTriggeredAbility> {
+class LeylinePhantomTriggeredAbility extends TriggeredAbilityImpl {
 
 
     public LeylinePhantomTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
index 4fbf178b9d4..16678560cce 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/ObzedatGhostCouncil.java
@@ -125,7 +125,7 @@ class ObzedatGhostCouncilExileSourceEffect extends OneShotEffect<ObzedatGhostCou
 
 }
 
-class BeginningOfYourUpkeepdelayTriggeredAbility extends DelayedTriggeredAbility<BeginningOfYourUpkeepdelayTriggeredAbility> {
+class BeginningOfYourUpkeepdelayTriggeredAbility extends DelayedTriggeredAbility {
 
     public BeginningOfYourUpkeepdelayTriggeredAbility() {
         this(new ObzedatGhostCouncilReturnEffect(), TargetController.YOU);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
index 5bac1575aca..89fdc78b010 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/RustScarab.java
@@ -85,7 +85,7 @@ public class RustScarab extends CardImpl<RustScarab> {
 }
 
 
-class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl<BecomesBlockedTriggeredAbility> {
+class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesBlockedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java
index 71972570126..728c01a3afd 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/VizkopaGuildmage.java
@@ -98,7 +98,7 @@ public class VizkopaGuildmage extends CardImpl<VizkopaGuildmage> {
     }
 }
 
-class VizkopaGuildmageDelayedTriggeredAbility extends DelayedTriggeredAbility<VizkopaGuildmageDelayedTriggeredAbility> {
+class VizkopaGuildmageDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public VizkopaGuildmageDelayedTriggeredAbility() {
         super(new OpponentsLoseLifeEffect(), Duration.EndOfTurn, false);
diff --git a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java
index 3b454c3bad7..073249381f7 100644
--- a/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java
+++ b/Mage.Sets/src/mage/sets/guildpact/BurningTreeShaman.java
@@ -71,7 +71,7 @@ public class BurningTreeShaman extends CardImpl<BurningTreeShaman> {
     }
 }
 
-class BurningTreeShamanTriggeredAbility extends TriggeredAbilityImpl<BurningTreeShamanTriggeredAbility> {
+class BurningTreeShamanTriggeredAbility extends TriggeredAbilityImpl {
     BurningTreeShamanTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
         this.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java b/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java
index 21d024d39f3..ab780171951 100644
--- a/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java
+++ b/Mage.Sets/src/mage/sets/guildpact/SoulsOfTheFaultless.java
@@ -77,7 +77,7 @@ public class SoulsOfTheFaultless extends CardImpl<SoulsOfTheFaultless> {
     }
 }
 
-class SoulsOfTheFaultlessTriggeredAbility extends TriggeredAbilityImpl<SoulsOfTheFaultlessTriggeredAbility> {
+class SoulsOfTheFaultlessTriggeredAbility extends TriggeredAbilityImpl {
 
     public SoulsOfTheFaultlessTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SoulsOfTheFaultlessEffect());
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java
index 1c2e8948b5b..ddc37bcfcf7 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/DeusOfCalamity.java
@@ -77,7 +77,7 @@ public class DeusOfCalamity extends CardImpl<DeusOfCalamity> {
     }
 }
 
-class DeusOfCalamityTriggeredAbility extends TriggeredAbilityImpl<DeusOfCalamityTriggeredAbility> {
+class DeusOfCalamityTriggeredAbility extends TriggeredAbilityImpl {
 
     public DeusOfCalamityTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java b/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java
index 3e0f4afb562..d58a742bfc3 100644
--- a/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java
+++ b/Mage.Sets/src/mage/sets/heroesvsmonsters/KavuPredator.java
@@ -75,7 +75,7 @@ public class KavuPredator extends CardImpl<KavuPredator> {
     }
 }
 
-class KavuPredatorTriggeredAbility extends TriggeredAbilityImpl<KavuPredatorTriggeredAbility> {
+class KavuPredatorTriggeredAbility extends TriggeredAbilityImpl {
 
     public KavuPredatorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new KavuPredatorEffect());
diff --git a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java
index a413242186c..403bc7c2ba3 100644
--- a/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java
+++ b/Mage.Sets/src/mage/sets/innistrad/BurningVengeance.java
@@ -64,7 +64,7 @@ public class BurningVengeance extends CardImpl<BurningVengeance> {
     }
 }
 
-class BurningVengeanceOnCastAbility extends TriggeredAbilityImpl<BurningVengeanceOnCastAbility> {
+class BurningVengeanceOnCastAbility extends TriggeredAbilityImpl {
 
     private static final String abilityText = "Whenever you cast a spell from your graveyard, Burning Vengeance deals 2 damage to target creature or player";
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java b/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java
index 4f804e7d2d0..2cc944f9603 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CreepyDoll.java
@@ -75,7 +75,7 @@ public class CreepyDoll extends CardImpl<CreepyDoll> {
     }
 }
 
-class CreepyDollTriggeredAbility extends TriggeredAbilityImpl<CreepyDollTriggeredAbility> {
+class CreepyDollTriggeredAbility extends TriggeredAbilityImpl {
 
     CreepyDollTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreepyDollEffect());
diff --git a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java
index 637b02858d0..a7419302fb7 100644
--- a/Mage.Sets/src/mage/sets/innistrad/Curiosity.java
+++ b/Mage.Sets/src/mage/sets/innistrad/Curiosity.java
@@ -81,7 +81,7 @@ public class Curiosity extends CardImpl<Curiosity> {
 }
 
 
-class CuriosityAbility extends TriggeredAbilityImpl<CuriosityAbility> {
+class CuriosityAbility extends TriggeredAbilityImpl {
 
     public CuriosityAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java
index ce9e569d870..619f9f091c6 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfOblivion.java
@@ -83,7 +83,7 @@ public class CurseOfOblivion extends CardImpl<CurseOfOblivion> {
     }
 }
 
-class CurseOfOblivionAbility extends TriggeredAbilityImpl<CurseOfOblivionAbility> {
+class CurseOfOblivionAbility extends TriggeredAbilityImpl {
 
     public CurseOfOblivionAbility() {
         super(Zone.BATTLEFIELD, new ExileFromZoneTargetEffect(Zone.GRAVEYARD, null, "", new FilterCard(), 2));
diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java
index 8bf18b90f9b..21c6f28808f 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfStalkedPrey.java
@@ -85,7 +85,7 @@ public class CurseOfStalkedPrey extends CardImpl<CurseOfStalkedPrey> {
     }
 }
 
-class CurseOfStalkedPreyTriggeredAbility extends TriggeredAbilityImpl<CurseOfStalkedPreyTriggeredAbility> {
+class CurseOfStalkedPreyTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfStalkedPreyTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.P1P1.createInstance()));
diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java
index dbf56e68343..27b17a00b6d 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfTheBloodyTome.java
@@ -81,7 +81,7 @@ public class CurseOfTheBloodyTome extends CardImpl<CurseOfTheBloodyTome> {
     }
 }
 
-class CurseOfTheBloodyTomeAbility extends TriggeredAbilityImpl<CurseOfTheBloodyTomeAbility> {
+class CurseOfTheBloodyTomeAbility extends TriggeredAbilityImpl {
 
     public CurseOfTheBloodyTomeAbility() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java
index a84a01ce4f3..dfa809fa6d5 100644
--- a/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java
+++ b/Mage.Sets/src/mage/sets/innistrad/CurseOfThePiercedHeart.java
@@ -82,7 +82,7 @@ public class CurseOfThePiercedHeart extends CardImpl<CurseOfThePiercedHeart> {
     }
 }
 
-class CurseOfThePiercedHeartAbility extends TriggeredAbilityImpl<CurseOfThePiercedHeartAbility> {
+class CurseOfThePiercedHeartAbility extends TriggeredAbilityImpl {
 
     public CurseOfThePiercedHeartAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java
index 56c48a8811f..08e68a86c3b 100644
--- a/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java
+++ b/Mage.Sets/src/mage/sets/innistrad/FalkenrathNoble.java
@@ -73,7 +73,7 @@ public class FalkenrathNoble extends CardImpl<FalkenrathNoble> {
     }
 }
 
-class FalkenrathNobleTriggeredAbility extends TriggeredAbilityImpl<FalkenrathNobleTriggeredAbility> {
+class FalkenrathNobleTriggeredAbility extends TriggeredAbilityImpl {
 
     public FalkenrathNobleTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java
index 0ab7bda6e07..aff7d27835b 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GarrukRelentless.java
@@ -91,7 +91,7 @@ public class GarrukRelentless extends CardImpl<GarrukRelentless> {
     }
 }
 
-class GarrukRelentlessTriggeredAbility extends TriggeredAbilityImpl<GarrukRelentlessTriggeredAbility> {
+class GarrukRelentlessTriggeredAbility extends TriggeredAbilityImpl {
 
     public GarrukRelentlessTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TransformSourceEffect(true), false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
index 6f7395d8f4d..af77af9d746 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GrimgrinCorpseBorn.java
@@ -97,7 +97,7 @@ public class GrimgrinCorpseBorn extends CardImpl<GrimgrinCorpseBorn> {
     }
 }
 
-class GrimgrinCorpseBornAbility extends TriggeredAbilityImpl<GrimgrinCorpseBornAbility> {
+class GrimgrinCorpseBornAbility extends TriggeredAbilityImpl {
 
     public GrimgrinCorpseBornAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java
index 2c9df835fc5..a7a88777914 100644
--- a/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java
+++ b/Mage.Sets/src/mage/sets/innistrad/GutterGrime.java
@@ -78,7 +78,7 @@ public class GutterGrime extends CardImpl<GutterGrime> {
     }
 }
 
-class GutterGrimeTriggeredAbility extends TriggeredAbilityImpl<GutterGrimeTriggeredAbility> {
+class GutterGrimeTriggeredAbility extends TriggeredAbilityImpl {
 
     public GutterGrimeTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.SLIME.createInstance()), false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java b/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java
index d35c0fad52c..9222f736b25 100644
--- a/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java
+++ b/Mage.Sets/src/mage/sets/innistrad/HomicidalBrute.java
@@ -75,7 +75,7 @@ public class HomicidalBrute extends CardImpl<HomicidalBrute> {
 
 }
 
-class HomicidalBruteTriggeredAbility extends TriggeredAbilityImpl<HomicidalBruteTriggeredAbility> {
+class HomicidalBruteTriggeredAbility extends TriggeredAbilityImpl {
 
     public HomicidalBruteTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TapSourceEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java
index cfb661fd2d7..9e9598fa719 100644
--- a/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java
+++ b/Mage.Sets/src/mage/sets/innistrad/OrchardSpirit.java
@@ -71,7 +71,7 @@ public class OrchardSpirit extends CardImpl<OrchardSpirit> {
     }
 }
 
-class OrchardSpiritAbility extends EvasionAbility<OrchardSpiritAbility> {
+class OrchardSpiritAbility extends EvasionAbility {
 
     private static OrchardSpiritAbility instance;
 
diff --git a/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java
index a69da60d87f..6bd52d44a69 100644
--- a/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java
+++ b/Mage.Sets/src/mage/sets/innistrad/RakishHeir.java
@@ -71,7 +71,7 @@ public class RakishHeir extends CardImpl<RakishHeir> {
     }
 }
 
-class RakishHeirTriggeredAbility extends TriggeredAbilityImpl<RakishHeirTriggeredAbility> {
+class RakishHeirTriggeredAbility extends TriggeredAbilityImpl {
 
     public RakishHeirTriggeredAbility() {
         super(Zone.BATTLEFIELD, null, false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
index 2e6a837a706..dbe1cf8b863 100644
--- a/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
+++ b/Mage.Sets/src/mage/sets/innistrad/ReaperFromTheAbyss.java
@@ -84,7 +84,7 @@ public class ReaperFromTheAbyss extends CardImpl<ReaperFromTheAbyss> {
 
 }
 
-class ReaperFromTheAbyssAbility extends TriggeredAbilityImpl<ReaperFromTheAbyssAbility> {
+class ReaperFromTheAbyssAbility extends TriggeredAbilityImpl {
 
     public ReaperFromTheAbyssAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java
index 2f3b1b2472c..32979a8bcb2 100644
--- a/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java
+++ b/Mage.Sets/src/mage/sets/innistrad/ScreechingBat.java
@@ -82,7 +82,7 @@ public class ScreechingBat extends CardImpl<ScreechingBat> {
     }
 }
 
-class ScreechingBatBeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl<ScreechingBatBeginningOfUpkeepTriggeredAbility> {
+class ScreechingBatBeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
 
     public ScreechingBatBeginningOfUpkeepTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ScreechingBatTransformSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
index 92297e315bc..b28e26574f3 100644
--- a/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
+++ b/Mage.Sets/src/mage/sets/innistrad/SkaabRuinator.java
@@ -85,7 +85,7 @@ public class SkaabRuinator extends CardImpl<SkaabRuinator> {
     }
 }
 
-class SkaabRuinatorAbility extends ActivatedAbilityImpl<SkaabRuinatorAbility> {
+class SkaabRuinatorAbility extends ActivatedAbilityImpl {
 
     public SkaabRuinatorAbility(ManaCosts costs, TimingRule timingRule) {
         super(Zone.GRAVEYARD, new SkaabRuinatorEffect(), costs);
diff --git a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java
index 09fa605b026..d78ec099e28 100644
--- a/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java
+++ b/Mage.Sets/src/mage/sets/innistrad/ThrabenSentry.java
@@ -78,7 +78,7 @@ public class ThrabenSentry extends CardImpl<ThrabenSentry> {
     }
 }
 
-class ThrabenSentryTriggeredAbility extends TriggeredAbilityImpl<ThrabenSentryTriggeredAbility> {
+class ThrabenSentryTriggeredAbility extends TriggeredAbilityImpl {
 
     public ThrabenSentryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TransformSourceEffect(true), true);
diff --git a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java
index b7e059580f8..b7f23fd26b1 100644
--- a/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java
+++ b/Mage.Sets/src/mage/sets/innistrad/UndeadAlchemist.java
@@ -83,7 +83,7 @@ public class UndeadAlchemist extends CardImpl<UndeadAlchemist> {
     }
 }
 
-class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl<UndeadAlchemistTriggeredAbility> {
+class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl {
 
     public UndeadAlchemistTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ExileTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java
index 1766efb911d..44c96413dde 100644
--- a/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java
+++ b/Mage.Sets/src/mage/sets/innistrad/VillageCannibals.java
@@ -70,7 +70,7 @@ public class VillageCannibals extends CardImpl<VillageCannibals> {
     }
 }
 
-class VillageCannibalsTriggeredAbility extends TriggeredAbilityImpl<VillageCannibalsTriggeredAbility> {
+class VillageCannibalsTriggeredAbility extends TriggeredAbilityImpl {
 
     public VillageCannibalsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
diff --git a/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java b/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java
index 5553ed11b43..a69e498c6cc 100644
--- a/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java
+++ b/Mage.Sets/src/mage/sets/innistrad/WoodenStake.java
@@ -76,7 +76,7 @@ public class WoodenStake extends CardImpl<WoodenStake> {
     }
 }
 
-class WoodenStakeBlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl<WoodenStakeBlocksOrBecomesBlockedTriggeredAbility> {
+class WoodenStakeBlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
 
     public WoodenStakeBlocksOrBecomesBlockedTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(true), false);
diff --git a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java
index ab8278cd876..61846f00f6a 100644
--- a/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java
+++ b/Mage.Sets/src/mage/sets/invasion/ArmadilloCloak.java
@@ -92,7 +92,7 @@ public class ArmadilloCloak extends CardImpl<ArmadilloCloak> {
     }
 }
 
-class ArmadilloCloakTriggeredAbility extends TriggeredAbilityImpl<ArmadilloCloakTriggeredAbility> {
+class ArmadilloCloakTriggeredAbility extends TriggeredAbilityImpl {
 
     public ArmadilloCloakTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ArmadilloCloakEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
index 2622270b862..e813e3cec30 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/AthreosGodOfPassage.java
@@ -148,7 +148,7 @@ class AthreosGodOfPassageReturnEffect extends OneShotEffect<AthreosGodOfPassageR
     }
 }
 
-class AthreosDiesCreatureTriggeredAbility extends TriggeredAbilityImpl<AthreosDiesCreatureTriggeredAbility> {
+class AthreosDiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     protected FilterCreaturePermanent filter;
     private boolean setTargetPointer;
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java
index edfd9780d26..87aa9e049cc 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/BanishingLight.java
@@ -122,7 +122,7 @@ class BanishingLightExileEffect extends OneShotEffect<BanishingLightExileEffect>
  * @author LevelX2
  */
 
-class BanishingLightReturnExiledAbility extends TriggeredAbilityImpl<BanishingLightReturnExiledAbility> {
+class BanishingLightReturnExiledAbility extends TriggeredAbilityImpl {
 
     public BanishingLightReturnExiledAbility() {
         super(Zone.BATTLEFIELD, new ReturnExiledCreatureEffect());
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java
index 956e891432d..1d54c5879d4 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/BloodcrazedHoplite.java
@@ -86,7 +86,7 @@ public class BloodcrazedHoplite extends CardImpl<BloodcrazedHoplite> {
     }
 }
 
-class BloodcrazedHopliteTriggeredAbility extends TriggeredAbilityImpl<BloodcrazedHopliteTriggeredAbility> {
+class BloodcrazedHopliteTriggeredAbility extends TriggeredAbilityImpl {
 
     public BloodcrazedHopliteTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RemoveCounterTargetEffect(CounterType.P1P1.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java
index ec86c081ca8..0e1ed7586ff 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/BrainMaggot.java
@@ -130,7 +130,7 @@ class BrainMaggotExileEffect extends OneShotEffect<BrainMaggotExileEffect> {
  * @author LevelX2
  */
 
-class BrainMaggotReturnExiledAbility extends TriggeredAbilityImpl<BrainMaggotReturnExiledAbility> {
+class BrainMaggotReturnExiledAbility extends TriggeredAbilityImpl {
 
     public BrainMaggotReturnExiledAbility() {
         super(Zone.BATTLEFIELD, new BrainMaggotReturnExiledCreatureEffect());
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java
index f2f5e31c8fd..5b95879dc52 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/DictateOfKruphix.java
@@ -67,7 +67,7 @@ public class DictateOfKruphix extends CardImpl<DictateOfKruphix> {
     }
 }
 
-class DictateOfKruphixAbility extends TriggeredAbilityImpl<DictateOfKruphixAbility> {
+class DictateOfKruphixAbility extends TriggeredAbilityImpl {
 
     public DictateOfKruphixAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java
index eeaf30b7313..c21031256e1 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/EidolonOfTheGreatRevel.java
@@ -72,7 +72,7 @@ public class EidolonOfTheGreatRevel extends CardImpl<EidolonOfTheGreatRevel> {
 }
 
 
-class EidolonOfTheGreatRevelTriggeredAbility extends TriggeredAbilityImpl<EidolonOfTheGreatRevelTriggeredAbility> {
+class EidolonOfTheGreatRevelTriggeredAbility extends TriggeredAbilityImpl {
 
 
     public EidolonOfTheGreatRevelTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java
index 9c54165cb78..7b4f025e873 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/Godsend.java
@@ -97,7 +97,7 @@ public class Godsend extends CardImpl<Godsend> {
     }
 }
 
-class GodsendTriggeredAbility extends TriggeredAbilityImpl<GodsendTriggeredAbility> {
+class GodsendTriggeredAbility extends TriggeredAbilityImpl {
 
     private Set<UUID> possibleTargets = new HashSet<>();
     
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java
index bb2cd6b5016..ea7018323a4 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/KeranosGodOfStorms.java
@@ -94,7 +94,7 @@ public class KeranosGodOfStorms extends CardImpl<KeranosGodOfStorms> {
     }
 }
 
-class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl<KeranosGodOfStormsTriggeredAbility> {
+class KeranosGodOfStormsTriggeredAbility extends TriggeredAbilityImpl {
 
     private int lastTriggeredTurn;
     
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java
index 25e193a2990..b642d1f4a8a 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/KnowledgeAndPower.java
@@ -72,7 +72,7 @@ public class KnowledgeAndPower extends CardImpl<KnowledgeAndPower> {
     }
 }
 
-class ScryTriggeredAbility extends TriggeredAbilityImpl<ScryTriggeredAbility> {
+class ScryTriggeredAbility extends TriggeredAbilityImpl {
 
     public ScryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new GenericManaCost(2)), false);
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java
index 86b649ef53a..2077cd47beb 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/MortalObstinacy.java
@@ -88,7 +88,7 @@ public class MortalObstinacy extends CardImpl<MortalObstinacy> {
     }
 }
 
-class MortalObstinacyAbility extends TriggeredAbilityImpl<MortalObstinacyAbility> {
+class MortalObstinacyAbility extends TriggeredAbilityImpl {
 
     public MortalObstinacyAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new DestroyTargetEffect(), new SacrificeSourceCost()));
diff --git a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java
index 981bfc0b9cf..ddbe67e9dc1 100644
--- a/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java
+++ b/Mage.Sets/src/mage/sets/journeyintonyx/SwarmbornGiant.java
@@ -87,7 +87,7 @@ public class SwarmbornGiant extends CardImpl<SwarmbornGiant> {
     }
 }
 
-class SwarmbornGiantTriggeredAbility extends TriggeredAbilityImpl<SwarmbornGiantTriggeredAbility> {
+class SwarmbornGiantTriggeredAbility extends TriggeredAbilityImpl {
 
     public SwarmbornGiantTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/legends/Abomination.java b/Mage.Sets/src/mage/sets/legends/Abomination.java
index 5a62c20b378..39e06877b8d 100644
--- a/Mage.Sets/src/mage/sets/legends/Abomination.java
+++ b/Mage.Sets/src/mage/sets/legends/Abomination.java
@@ -74,7 +74,7 @@ public class Abomination extends CardImpl<Abomination> {
     }
 }
 
-class AbominationTriggeredAbility extends TriggeredAbilityImpl<AbominationTriggeredAbility> {
+class AbominationTriggeredAbility extends TriggeredAbilityImpl {
 
     AbominationTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AbominationEffect());
diff --git a/Mage.Sets/src/mage/sets/legions/ToxinSliver.java b/Mage.Sets/src/mage/sets/legions/ToxinSliver.java
index f4632640c63..63182ed92f9 100644
--- a/Mage.Sets/src/mage/sets/legions/ToxinSliver.java
+++ b/Mage.Sets/src/mage/sets/legions/ToxinSliver.java
@@ -71,7 +71,7 @@ public class ToxinSliver extends CardImpl<ToxinSliver> {
     }
 }
 
-class DealsDamageTriggeredAbility extends TriggeredAbilityImpl<DealsDamageTriggeredAbility> {
+class DealsDamageTriggeredAbility extends TriggeredAbilityImpl {
     
      private boolean setTargetPointer;
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/AnkhOfMishra.java b/Mage.Sets/src/mage/sets/limitedalpha/AnkhOfMishra.java
index 29e16f6df8b..d492dee857f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/AnkhOfMishra.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/AnkhOfMishra.java
@@ -67,7 +67,7 @@ public class AnkhOfMishra extends CardImpl<AnkhOfMishra> {
     }
 }
 
-class AnkhOfMishraAbility extends TriggeredAbilityImpl<AnkhOfMishraAbility> {
+class AnkhOfMishraAbility extends TriggeredAbilityImpl {
 
     public AnkhOfMishraAbility() {
             super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java b/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java
index 5dafdc90192..545d6108f96 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Cockatrice.java
@@ -76,7 +76,7 @@ public class Cockatrice extends CardImpl<Cockatrice> {
     }
 }
 
-class CockatriceTriggeredAbility extends TriggeredAbilityImpl<CockatriceTriggeredAbility> {
+class CockatriceTriggeredAbility extends TriggeredAbilityImpl {
 
     CockatriceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CockatriceEffect());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/CrystalRod.java b/Mage.Sets/src/mage/sets/limitedalpha/CrystalRod.java
index 48d70734996..8d6367c7827 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/CrystalRod.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/CrystalRod.java
@@ -67,7 +67,7 @@ public class CrystalRod extends CardImpl<CrystalRod> {
     }
 }
 
-class CrystalRodAbility extends TriggeredAbilityImpl<CrystalRodAbility> {
+class CrystalRodAbility extends TriggeredAbilityImpl {
 
     public CrystalRodAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new GainLifeEffect(1), new GenericManaCost(1)), false);
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/DingusEgg.java b/Mage.Sets/src/mage/sets/limitedalpha/DingusEgg.java
index 9963df97c66..9e5b9b2ec91 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/DingusEgg.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/DingusEgg.java
@@ -67,7 +67,7 @@ public class DingusEgg extends CardImpl<DingusEgg> {
     }
 }
 
-class DingusEggTriggeredAbility extends TriggeredAbilityImpl<DingusEggTriggeredAbility> {
+class DingusEggTriggeredAbility extends TriggeredAbilityImpl {
 
     public DingusEggTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2), false);
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java b/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java
index 2e1ccd04b58..2dbc69d2fd8 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/Fastbond.java
@@ -71,7 +71,7 @@ public class Fastbond extends CardImpl<Fastbond> {
 }
 
 
-class PlayALandTriggeredAbility extends TriggeredAbilityImpl<PlayALandTriggeredAbility> {
+class PlayALandTriggeredAbility extends TriggeredAbilityImpl {
 
 
 
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/IronStar.java b/Mage.Sets/src/mage/sets/limitedalpha/IronStar.java
index fe81e8b465d..b5389c115f5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/IronStar.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/IronStar.java
@@ -67,7 +67,7 @@ public class IronStar extends CardImpl<IronStar> {
     }
 }
 
-class IronStarAbility extends TriggeredAbilityImpl<IronStarAbility> {
+class IronStarAbility extends TriggeredAbilityImpl {
 
     public IronStarAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new GainLifeEffect(1), new GenericManaCost(1)), false);
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/IvoryCup.java b/Mage.Sets/src/mage/sets/limitedalpha/IvoryCup.java
index 2bd755d9999..d75e430c19f 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/IvoryCup.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/IvoryCup.java
@@ -66,7 +66,7 @@ public class IvoryCup extends CardImpl<IvoryCup> {
         return new IvoryCup(this);
     }
 }
-class IvoryCupAbility extends TriggeredAbilityImpl<IvoryCupAbility> {
+class IvoryCupAbility extends TriggeredAbilityImpl {
 
     public IvoryCupAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new GainLifeEffect(1), new GenericManaCost(1)), false);
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java b/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java
index 5d2a7867b0d..1002c0906b5 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PirateShip.java
@@ -123,7 +123,7 @@ class PirateShipEffect extends ReplacementEffectImpl<PirateShipEffect> {
     }
 }
 
-class PirateShipTriggeredAbility extends StateTriggeredAbility<PirateShipTriggeredAbility> {
+class PirateShipTriggeredAbility extends StateTriggeredAbility {
 
     public PirateShipTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java b/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java
index 3b11f277e49..b872bacaefb 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java
@@ -80,7 +80,7 @@ public class PsychicVenom extends CardImpl<PsychicVenom> {
     }
 }
 
-class PsychicVenomAbility extends TriggeredAbilityImpl<PsychicVenomAbility> {
+class PsychicVenomAbility extends TriggeredAbilityImpl {
     PsychicVenomAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2, true, "that land's controller"));
     }
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java b/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java
index b37b41b56ff..45395aea8f2 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/SeaSerpent.java
@@ -81,7 +81,7 @@ public class SeaSerpent extends CardImpl<SeaSerpent> {
     }
 }
 
-class SeaSerpentTriggeredAbility extends StateTriggeredAbility<SeaSerpentTriggeredAbility> {
+class SeaSerpentTriggeredAbility extends StateTriggeredAbility {
 
     public SeaSerpentTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java b/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java
index 9a28e7f9356..87adf862907 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ThicketBasilisk.java
@@ -73,7 +73,7 @@ public class ThicketBasilisk extends CardImpl<ThicketBasilisk> {
     }
 }
 
-class ThicketBasiliskTriggeredAbility extends TriggeredAbilityImpl<ThicketBasiliskTriggeredAbility> {
+class ThicketBasiliskTriggeredAbility extends TriggeredAbilityImpl {
 
     ThicketBasiliskTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ThicketBasiliskEffect());
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/ThroneOfBone.java b/Mage.Sets/src/mage/sets/limitedalpha/ThroneOfBone.java
index 1ccfd8090d3..2240fdbc439 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/ThroneOfBone.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/ThroneOfBone.java
@@ -67,7 +67,7 @@ public class ThroneOfBone extends CardImpl<ThroneOfBone> {
     }
 }
 
-class ThroneOfBoneAbility extends TriggeredAbilityImpl<ThroneOfBoneAbility> {
+class ThroneOfBoneAbility extends TriggeredAbilityImpl {
 
     public ThroneOfBoneAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new GainLifeEffect(1), new GenericManaCost(1)), false);
diff --git a/Mage.Sets/src/mage/sets/limitedalpha/WoodenSphere.java b/Mage.Sets/src/mage/sets/limitedalpha/WoodenSphere.java
index 642b941e0f8..a037f1c92eb 100644
--- a/Mage.Sets/src/mage/sets/limitedalpha/WoodenSphere.java
+++ b/Mage.Sets/src/mage/sets/limitedalpha/WoodenSphere.java
@@ -67,7 +67,7 @@ public class WoodenSphere extends CardImpl<WoodenSphere> {
     }
 }
 
-class WoodenSphereAbility extends TriggeredAbilityImpl<WoodenSphereAbility> {
+class WoodenSphereAbility extends TriggeredAbilityImpl {
 
     public WoodenSphereAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new GainLifeEffect(1), new GenericManaCost(1)), false);
diff --git a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java
index 9a75c368877..a5e641c999a 100644
--- a/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java
+++ b/Mage.Sets/src/mage/sets/magic2010/DreadWarlock.java
@@ -69,7 +69,7 @@ public class DreadWarlock extends CardImpl<DreadWarlock> {
     }
 }
 
-class DreadWarlockAbility extends EvasionAbility<DreadWarlockAbility> {
+class DreadWarlockAbility extends EvasionAbility {
 
     private static DreadWarlockAbility instance;
 
diff --git a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java
index 85cdfc0b688..0c74dc88e83 100644
--- a/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java
+++ b/Mage.Sets/src/mage/sets/magic2010/GargoyleCastle.java
@@ -67,7 +67,7 @@ public class GargoyleCastle extends CardImpl<GargoyleCastle> {
 
 }
 
-class GargoyleCastleAbility extends ActivatedAbilityImpl<GargoyleCastleAbility> {
+class GargoyleCastleAbility extends ActivatedAbilityImpl {
 
     public GargoyleCastleAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/magic2010/HiveMind.java b/Mage.Sets/src/mage/sets/magic2010/HiveMind.java
index 810a964d97b..f670f8ede81 100644
--- a/Mage.Sets/src/mage/sets/magic2010/HiveMind.java
+++ b/Mage.Sets/src/mage/sets/magic2010/HiveMind.java
@@ -69,7 +69,7 @@ public class HiveMind extends CardImpl<HiveMind> {
     }
 }
 
-class HiveMindTriggeredAbility extends TriggeredAbilityImpl<HiveMindTriggeredAbility> {
+class HiveMindTriggeredAbility extends TriggeredAbilityImpl {
 
     public HiveMindTriggeredAbility() {
         super(Zone.BATTLEFIELD, new HiveMindEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java
index 9a6f69b7443..76e4a6bfe97 100644
--- a/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java
+++ b/Mage.Sets/src/mage/sets/magic2010/HowlingMine.java
@@ -62,7 +62,7 @@ public class HowlingMine extends CardImpl<HowlingMine> {
 
 }
 
-class HowlingMineAbility extends TriggeredAbilityImpl<HowlingMineAbility> {
+class HowlingMineAbility extends TriggeredAbilityImpl {
 
     public HowlingMineAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/magic2010/IceCage.java b/Mage.Sets/src/mage/sets/magic2010/IceCage.java
index 22b090eb0bf..0acf0afaeec 100644
--- a/Mage.Sets/src/mage/sets/magic2010/IceCage.java
+++ b/Mage.Sets/src/mage/sets/magic2010/IceCage.java
@@ -84,7 +84,7 @@ public class IceCage extends CardImpl<IceCage> {
     }
 }
 
-class IceCageAbility extends TriggeredAbilityImpl<IceCageAbility> {
+class IceCageAbility extends TriggeredAbilityImpl {
 
     public IceCageAbility() {
         super(Zone.BATTLEFIELD, new DestroySourceEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
index dd0c3a20757..111dff6dcb6 100644
--- a/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
+++ b/Mage.Sets/src/mage/sets/magic2010/LightwielderPaladin.java
@@ -78,7 +78,7 @@ public class LightwielderPaladin extends CardImpl<LightwielderPaladin> {
     }
 }
 
-class LightwielderPaladinTriggeredAbility extends TriggeredAbilityImpl<LightwielderPaladinTriggeredAbility> {
+class LightwielderPaladinTriggeredAbility extends TriggeredAbilityImpl {
 
     public LightwielderPaladinTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ExileTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java b/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java
index c966b82027d..6e8ac2db6bf 100644
--- a/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java
+++ b/Mage.Sets/src/mage/sets/magic2010/MagebaneArmor.java
@@ -79,7 +79,7 @@ public class MagebaneArmor extends CardImpl<MagebaneArmor> {
     }
 }
 
-class MagebaneArmorAbility extends StaticAbility<MagebaneArmorAbility> {
+class MagebaneArmorAbility extends StaticAbility {
 
     public MagebaneArmorAbility() {
         super(Zone.BATTLEFIELD, new BoostEquippedEffect(2, 4));
diff --git a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
index 3af17768c7e..1b9eab2832b 100644
--- a/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
+++ b/Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
@@ -161,7 +161,7 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
 
     }
 
-    class ProteanHydraAbility extends TriggeredAbilityImpl<ProteanHydraAbility> {
+    class ProteanHydraAbility extends TriggeredAbilityImpl {
 
         public ProteanHydraAbility() {
             super(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new ProteanHydraDelayedTriggeredAbility()), false);
@@ -191,7 +191,7 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
 
     }
 
-    class ProteanHydraDelayedTriggeredAbility extends DelayedTriggeredAbility<ProteanHydraDelayedTriggeredAbility> {
+    class ProteanHydraDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
         public ProteanHydraDelayedTriggeredAbility() {
             super(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)));
diff --git a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java
index f96b7eff434..1d255defeae 100644
--- a/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java
+++ b/Mage.Sets/src/mage/sets/magic2010/SanguineBond.java
@@ -66,7 +66,7 @@ public class SanguineBond extends CardImpl<SanguineBond> {
     }
 }
 
-class SanguineBondTriggeredAbility extends TriggeredAbilityImpl<SanguineBondTriggeredAbility> {
+class SanguineBondTriggeredAbility extends TriggeredAbilityImpl {
 
     public SanguineBondTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java
index 686dd82a3e3..5020f73058c 100644
--- a/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java
+++ b/Mage.Sets/src/mage/sets/magic2010/VampireNocturnus.java
@@ -78,7 +78,7 @@ public class VampireNocturnus extends CardImpl<VampireNocturnus> {
     }
 }
 
-class VampireNocturnusAbility extends StaticAbility<VampireNocturnusAbility> {
+class VampireNocturnusAbility extends StaticAbility {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java
index 352bc51a9a0..ff4f302ffe0 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java
@@ -70,7 +70,7 @@ public class AjanisPridemate extends CardImpl<AjanisPridemate> {
 
 }
 
-class AjanisPridemateAbility extends TriggeredAbilityImpl<AjanisPridemateAbility> {
+class AjanisPridemateAbility extends TriggeredAbilityImpl {
 
     public AjanisPridemateAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
index d7fd2c5765a..4464e7521e6 100644
--- a/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
+++ b/Mage.Sets/src/mage/sets/magic2011/AncientHellkite.java
@@ -76,7 +76,7 @@ public class AncientHellkite extends CardImpl<AncientHellkite> {
 
 }
 
-class AncientHellkiteAbility extends ActivatedAbilityImpl<AncientHellkiteAbility> {
+class AncientHellkiteAbility extends ActivatedAbilityImpl {
 
     private static final FilterCreaturePermanent filterTemplate = new FilterCreaturePermanent("creature defending player controls");
 
diff --git a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java
index f86140bb482..a1c23f36567 100644
--- a/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java
+++ b/Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java
@@ -71,7 +71,7 @@ public class ChandrasSpitfire extends CardImpl<ChandrasSpitfire> {
 
 }
 
-class ChandrasSpitfireAbility extends TriggeredAbilityImpl<ChandrasSpitfireAbility> {
+class ChandrasSpitfireAbility extends TriggeredAbilityImpl {
 
     public ChandrasSpitfireAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(3, 0, Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
index 0ee77e7febe..44b15763f98 100644
--- a/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
@@ -74,7 +74,7 @@ public class FrostTitan extends CardImpl<FrostTitan> {
 
 }
 
-class FrostTitanAbility1 extends TriggeredAbilityImpl<FrostTitanAbility1> {
+class FrostTitanAbility1 extends TriggeredAbilityImpl {
 
     public FrostTitanAbility1() {
         super(Zone.BATTLEFIELD, new CounterUnlessPaysEffect(new GenericManaCost(2)), false);
@@ -108,7 +108,7 @@ class FrostTitanAbility1 extends TriggeredAbilityImpl<FrostTitanAbility1> {
 
 }
 
-class FrostTitanAbility2 extends TriggeredAbilityImpl<FrostTitanAbility2> {
+class FrostTitanAbility2 extends TriggeredAbilityImpl {
 
     public FrostTitanAbility2() {
         super(Zone.BATTLEFIELD, new TapTargetEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
index 4c4f6a2e937..e12474eae01 100644
--- a/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
@@ -71,7 +71,7 @@ public class GraveTitan extends CardImpl<GraveTitan> {
 
 }
 
-class GraveTitanAbility extends TriggeredAbilityImpl<GraveTitanAbility> {
+class GraveTitanAbility extends TriggeredAbilityImpl {
 
     public GraveTitanAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken("M11"), 2), false);
diff --git a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
index 3c232e53f2b..c1fab381e61 100644
--- a/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
@@ -74,7 +74,7 @@ public class InfernoTitan extends CardImpl<InfernoTitan> {
 
 }
 
-class InfernoTitanAbility extends TriggeredAbilityImpl<InfernoTitanAbility> {
+class InfernoTitanAbility extends TriggeredAbilityImpl {
 
     public InfernoTitanAbility() {
         super(Zone.BATTLEFIELD, new DamageMultiEffect(3), false);
diff --git a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
index 58fe1010eb0..5b000318961 100644
--- a/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
+++ b/Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
@@ -64,7 +64,7 @@ public class LilianasCaress extends CardImpl<LilianasCaress> {
 
 }
 
-class LilianasCaressAbility extends TriggeredAbilityImpl<LilianasCaressAbility> {
+class LilianasCaressAbility extends TriggeredAbilityImpl {
 
     public LilianasCaressAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2), false);
diff --git a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java
index d3cc5da153c..a15f5e6cde1 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java
@@ -78,7 +78,7 @@ public class PhylacteryLich extends CardImpl<PhylacteryLich> {
         return new PhylacteryLich(this);
     }
 
-    class PhylacteryLichAbility extends StateTriggeredAbility<PhylacteryLichAbility> {
+    class PhylacteryLichAbility extends StateTriggeredAbility {
 
         public PhylacteryLichAbility() {
             super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java
index 87a5aae0280..4af39af7327 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java
@@ -79,7 +79,7 @@ public class PrimalCocoon extends CardImpl<PrimalCocoon> {
     }
 }
 
-class PrimalCocoonAbility1 extends TriggeredAbilityImpl<PrimalCocoonAbility1> {
+class PrimalCocoonAbility1 extends TriggeredAbilityImpl {
 
     public PrimalCocoonAbility1() {
         super(Zone.BATTLEFIELD, new AddPlusOneCountersAttachedEffect(1));
@@ -108,7 +108,7 @@ class PrimalCocoonAbility1 extends TriggeredAbilityImpl<PrimalCocoonAbility1> {
     }
 }
 
-class PrimalCocoonAbility2 extends TriggeredAbilityImpl<PrimalCocoonAbility2> {
+class PrimalCocoonAbility2 extends TriggeredAbilityImpl {
 
     public PrimalCocoonAbility2() {
         super(Zone.BATTLEFIELD, new DestroySourceEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
index 8f846e00908..3fd23138f3c 100644
--- a/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/PrimevalTitan.java
@@ -73,7 +73,7 @@ public class PrimevalTitan extends CardImpl<PrimevalTitan> {
 
 }
 
-class PrimevalTitanAbility extends TriggeredAbilityImpl<PrimevalTitanAbility> {
+class PrimevalTitanAbility extends TriggeredAbilityImpl {
 
     public PrimevalTitanAbility() {
         super(Zone.BATTLEFIELD, null, true);
diff --git a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
index 169a10e0aee..75cbc01d313 100644
--- a/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
+++ b/Mage.Sets/src/mage/sets/magic2011/SunTitan.java
@@ -77,7 +77,7 @@ public class SunTitan extends CardImpl<SunTitan> {
 
 }
 
-class SunTitanAbility extends TriggeredAbilityImpl<SunTitanAbility> {
+class SunTitanAbility extends TriggeredAbilityImpl {
 
     private static final FilterCard filter = new FilterCard("permanent card with converted mana cost 3 or less from your graveyard");
 
diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java
index c20de813592..fd978f49b6b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ChandraTheFirebrand.java
@@ -89,7 +89,7 @@ public class ChandraTheFirebrand extends CardImpl<ChandraTheFirebrand> {
 
 }
 
-class ChandraTheFirebrandAbility extends DelayedTriggeredAbility<ChandraTheFirebrandAbility> {
+class ChandraTheFirebrandAbility extends DelayedTriggeredAbility {
     ChandraTheFirebrandAbility() {
         super(new CopyTargetSpellEffect(), Duration.EndOfTurn);
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java
index d24885b5f0c..ba338dffc97 100644
--- a/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java
+++ b/Mage.Sets/src/mage/sets/magic2012/ChandrasPhoenix.java
@@ -72,7 +72,7 @@ public class ChandrasPhoenix extends CardImpl<ChandrasPhoenix> {
     }
 }
 
-class ChandrasPhoenixTriggeredAbility extends TriggeredAbilityImpl<ChandrasPhoenixTriggeredAbility> {
+class ChandrasPhoenixTriggeredAbility extends TriggeredAbilityImpl {
     ChandrasPhoenixTriggeredAbility() {
         super(Zone.GRAVEYARD, new ReturnToHandSourceEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java
index 0c0eb28af1e..28fdb04ce84 100644
--- a/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java
+++ b/Mage.Sets/src/mage/sets/magic2012/CircleOfFlame.java
@@ -68,7 +68,7 @@ public class CircleOfFlame extends CardImpl<CircleOfFlame> {
     }
 }
 
-class CircleOfFlameTriggeredAbility extends TriggeredAbilityImpl<CircleOfFlameTriggeredAbility> {
+class CircleOfFlameTriggeredAbility extends TriggeredAbilityImpl {
 
     public CircleOfFlameTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java
index a5de836b851..40828896406 100644
--- a/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java
+++ b/Mage.Sets/src/mage/sets/magic2012/GideonsAvenger.java
@@ -69,7 +69,7 @@ public class GideonsAvenger extends CardImpl<GideonsAvenger> {
     }
 }
 
-class GideonsAvengerTriggeredAbility extends TriggeredAbilityImpl<GideonsAvengerTriggeredAbility> {
+class GideonsAvengerTriggeredAbility extends TriggeredAbilityImpl {
     GideonsAvengerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
     }
diff --git a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java
index 77f733b94d7..3eb1f38f6e4 100644
--- a/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java
+++ b/Mage.Sets/src/mage/sets/magic2012/HuntersInsight.java
@@ -69,7 +69,7 @@ public class HuntersInsight extends CardImpl<HuntersInsight> {
     }
 }
 
-class HuntersInsightTriggeredAbility extends TriggeredAbilityImpl<HuntersInsightTriggeredAbility> {
+class HuntersInsightTriggeredAbility extends TriggeredAbilityImpl {
 
     public HuntersInsightTriggeredAbility() {
         super(Zone.BATTLEFIELD, null, false);
diff --git a/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java
index 7d26e069fc3..9298811a805 100644
--- a/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java
+++ b/Mage.Sets/src/mage/sets/magic2012/RitesOfFlourishing.java
@@ -68,7 +68,7 @@ public class RitesOfFlourishing extends CardImpl<RitesOfFlourishing> {
     }
 }
 
-class RitesOfFlourishingAbility extends TriggeredAbilityImpl<RitesOfFlourishingAbility> {
+class RitesOfFlourishingAbility extends TriggeredAbilityImpl {
 
     public RitesOfFlourishingAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java b/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java
index c3e4f1cf57d..39b1b67152b 100644
--- a/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java
+++ b/Mage.Sets/src/mage/sets/magic2012/VengefulPharaoh.java
@@ -76,7 +76,7 @@ public class VengefulPharaoh extends CardImpl<VengefulPharaoh> {
     }
 }
 
-class VengefulPharaohTriggeredAbility extends TriggeredAbilityImpl<VengefulPharaohTriggeredAbility> {
+class VengefulPharaohTriggeredAbility extends TriggeredAbilityImpl {
 
     public VengefulPharaohTriggeredAbility() {
         super(Zone.GRAVEYARD, new VengefulPharaohEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
index 0bdd0405fd6..b0c18ad0711 100644
--- a/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
+++ b/Mage.Sets/src/mage/sets/magic2012/WarstormSurge.java
@@ -71,7 +71,7 @@ public class WarstormSurge extends CardImpl<WarstormSurge> {
     }
 }
 
-class WarstormSurgeTriggeredAbility extends TriggeredAbilityImpl<WarstormSurgeTriggeredAbility> {
+class WarstormSurgeTriggeredAbility extends TriggeredAbilityImpl {
 
     public WarstormSurgeTriggeredAbility() {
         super(Zone.BATTLEFIELD, new WarstormSurgeEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java b/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java
index 13bb1edf5ab..9617c1accca 100644
--- a/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java
+++ b/Mage.Sets/src/mage/sets/magic2012/Worldslayer.java
@@ -69,7 +69,7 @@ public class Worldslayer extends CardImpl<Worldslayer> {
     }
 }
 
-class WorldslayerTriggeredAbility extends TriggeredAbilityImpl<WorldslayerTriggeredAbility> {
+class WorldslayerTriggeredAbility extends TriggeredAbilityImpl {
 
     WorldslayerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new WorldslayerEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java
index e1bd2ef6f60..32fad7f8d4f 100644
--- a/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java
+++ b/Mage.Sets/src/mage/sets/magic2013/BloodReckoning.java
@@ -67,7 +67,7 @@ public class BloodReckoning extends CardImpl<BloodReckoning> {
     }
 }
 
-class BloodReckoningTriggeredAbility extends TriggeredAbilityImpl<BloodReckoningTriggeredAbility> {
+class BloodReckoningTriggeredAbility extends TriggeredAbilityImpl {
 
     public BloodReckoningTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
index 172e6fc2cdb..e4b1fe40483 100644
--- a/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
+++ b/Mage.Sets/src/mage/sets/magic2013/HamletbackGoliath.java
@@ -75,7 +75,7 @@ public class HamletbackGoliath extends CardImpl<HamletbackGoliath> {
     }
 }
 
-class HamletbackGoliathTriggeredAbility extends TriggeredAbilityImpl<HamletbackGoliathTriggeredAbility> {
+class HamletbackGoliathTriggeredAbility extends TriggeredAbilityImpl {
     HamletbackGoliathTriggeredAbility() {
         super(Zone.BATTLEFIELD, new HamletbackGoliathEffect(), true);
     }
diff --git a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java
index 70358ad2d56..0f3889a6b1f 100644
--- a/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java
+++ b/Mage.Sets/src/mage/sets/magic2013/NefaroxOverlordOfGrixis.java
@@ -78,7 +78,7 @@ public class NefaroxOverlordOfGrixis extends CardImpl<NefaroxOverlordOfGrixis> {
     }
 }
 
-class NefaroxOverlordOfGrixisTriggeredAbility extends TriggeredAbilityImpl<NefaroxOverlordOfGrixisTriggeredAbility> {
+class NefaroxOverlordOfGrixisTriggeredAbility extends TriggeredAbilityImpl {
     
     private static final FilterControlledPermanent filter;
 
diff --git a/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
index 8e1d2177a47..dba1a45d331 100644
--- a/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
+++ b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
@@ -73,7 +73,7 @@ public class OdricMasterTactician extends CardImpl<OdricMasterTactician> {
     }
 }
 
-class OdricMasterTacticianTriggeredAbility extends TriggeredAbilityImpl<OdricMasterTacticianTriggeredAbility> {
+class OdricMasterTacticianTriggeredAbility extends TriggeredAbilityImpl {
 
     public OdricMasterTacticianTriggeredAbility() {
         super(Zone.BATTLEFIELD, new OdricMasterTacticianEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java
index 0c7b4e08253..23896fcceb7 100644
--- a/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java
+++ b/Mage.Sets/src/mage/sets/magic2013/SlumberingDragon.java
@@ -122,7 +122,7 @@ class SlumberingDragonEffect extends RestrictionEffect<SlumberingDragonEffect> {
     }
 }
 
-class SlumberingDragonTriggeredAbility extends TriggeredAbilityImpl<SlumberingDragonTriggeredAbility> {
+class SlumberingDragonTriggeredAbility extends TriggeredAbilityImpl {
 
     public SlumberingDragonTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
diff --git a/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java b/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java
index d1fb3e8c9a4..e9eeddedb7c 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ArchangelOfThune.java
@@ -76,7 +76,7 @@ public class ArchangelOfThune extends CardImpl<ArchangelOfThune> {
     }
 }
 
-class ArchangelOfThuneAbility extends TriggeredAbilityImpl<ArchangelOfThuneAbility> {
+class ArchangelOfThuneAbility extends TriggeredAbilityImpl {
 
     public ArchangelOfThuneAbility() {
         super(Zone.BATTLEFIELD, new AddCountersAllEffect(CounterType.P1P1.createInstance(), new FilterControlledCreaturePermanent()), false);
diff --git a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java
index 9e103441f3b..765b73764ba 100644
--- a/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java
+++ b/Mage.Sets/src/mage/sets/magic2014/BanisherPriest.java
@@ -128,7 +128,7 @@ class BanisherPriestExileEffect extends OneShotEffect<BanisherPriestExileEffect>
  * @author LevelX2
  */
 
-class BanisherPriestReturnExiledAbility extends TriggeredAbilityImpl<BanisherPriestReturnExiledAbility> {
+class BanisherPriestReturnExiledAbility extends TriggeredAbilityImpl {
 
     public BanisherPriestReturnExiledAbility() {
         super(Zone.BATTLEFIELD, new ReturnExiledCreatureEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java b/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java
index 93b4d09a3b6..bf60f1401e2 100644
--- a/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java
+++ b/Mage.Sets/src/mage/sets/magic2014/BurningEarth.java
@@ -65,7 +65,7 @@ public class BurningEarth extends CardImpl<BurningEarth> {
     }
 }
 
-class BurningEarthTriggeredAbility extends TriggeredAbilityImpl<BurningEarthTriggeredAbility> {
+class BurningEarthTriggeredAbility extends TriggeredAbilityImpl {
 
     public BurningEarthTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
index f88aec63718..30966c04958 100644
--- a/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
+++ b/Mage.Sets/src/mage/sets/magic2014/ColossalWhale.java
@@ -85,7 +85,7 @@ public class ColossalWhale extends CardImpl<ColossalWhale> {
     }
 }
 
-class ColossalWhaleAbility extends TriggeredAbilityImpl<ColossalWhaleAbility> {
+class ColossalWhaleAbility extends TriggeredAbilityImpl {
 
     public ColossalWhaleAbility() {
         super(Zone.BATTLEFIELD, null);
@@ -157,7 +157,7 @@ class ColossalWhaleExileEffect extends OneShotEffect<ColossalWhaleExileEffect> {
  * @author LevelX2
  */
 
-class ColossalWhaleReturnExiledAbility extends TriggeredAbilityImpl<ColossalWhaleReturnExiledAbility> {
+class ColossalWhaleReturnExiledAbility extends TriggeredAbilityImpl {
 
     public ColossalWhaleReturnExiledAbility() {
         super(Zone.BATTLEFIELD, new ReturnExiledCreatureColossalWhaleEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2014/DoorOfDestinies.java b/Mage.Sets/src/mage/sets/magic2014/DoorOfDestinies.java
index d21bf43f41d..ede2cd34511 100644
--- a/Mage.Sets/src/mage/sets/magic2014/DoorOfDestinies.java
+++ b/Mage.Sets/src/mage/sets/magic2014/DoorOfDestinies.java
@@ -126,7 +126,7 @@ class ChooseCreatureTypeEffect extends OneShotEffect<ChooseCreatureTypeEffect> {
 
 }
 
-class AddCounterAbility extends TriggeredAbilityImpl<AddCounterAbility> {
+class AddCounterAbility extends TriggeredAbilityImpl {
 
     public AddCounterAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)), false);
diff --git a/Mage.Sets/src/mage/sets/magic2014/GuardianOfTheAges.java b/Mage.Sets/src/mage/sets/magic2014/GuardianOfTheAges.java
index 213b41bc154..ba7fe89d792 100644
--- a/Mage.Sets/src/mage/sets/magic2014/GuardianOfTheAges.java
+++ b/Mage.Sets/src/mage/sets/magic2014/GuardianOfTheAges.java
@@ -73,7 +73,7 @@ public class GuardianOfTheAges extends CardImpl<GuardianOfTheAges>{
     }
 }
 
-class GuardianOfTheAgesTriggerAbility extends TriggeredAbilityImpl<GuardianOfTheAgesTriggerAbility> {
+class GuardianOfTheAgesTriggerAbility extends TriggeredAbilityImpl {
     
     private static final FilterCard filter = new FilterCard("creature");
     static{
diff --git a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java
index e692a367710..0a19434fe16 100644
--- a/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java
+++ b/Mage.Sets/src/mage/sets/magic2014/IllusionaryArmor.java
@@ -81,7 +81,7 @@ public class IllusionaryArmor extends CardImpl<IllusionaryArmor> {
 }
 
 
-class IllusionaryArmorAbility extends TriggeredAbilityImpl<IllusionaryArmorAbility> {
+class IllusionaryArmorAbility extends TriggeredAbilityImpl {
 
     public IllusionaryArmorAbility() {
         super(Zone.BATTLEFIELD, new DestroySourceEffect());
diff --git a/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java
index ed69135f734..2e292955640 100644
--- a/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java
+++ b/Mage.Sets/src/mage/sets/magic2014/PathOfBravery.java
@@ -103,7 +103,7 @@ class LifeCondition implements Condition {
     }
 }
 
-class PathOfBraveryTriggeredAbility extends TriggeredAbilityImpl<PathOfBraveryTriggeredAbility> {
+class PathOfBraveryTriggeredAbility extends TriggeredAbilityImpl {
 
     public PathOfBraveryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PathOfBraveryEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java b/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java
index 9a7027cff82..5c9385cfd3b 100644
--- a/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java
+++ b/Mage.Sets/src/mage/sets/magic2014/WindreaderSphinx.java
@@ -73,7 +73,7 @@ public class WindreaderSphinx extends CardImpl<WindreaderSphinx> {
     }
 }
 
-class WindreaderSphinxTriggeredAbility extends TriggeredAbilityImpl<WindreaderSphinxTriggeredAbility> {
+class WindreaderSphinxTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
     static {
diff --git a/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java b/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java
index 0947dfd148e..4e93146fb04 100644
--- a/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java
+++ b/Mage.Sets/src/mage/sets/magic2014/Witchstalker.java
@@ -77,7 +77,7 @@ public class Witchstalker extends CardImpl<Witchstalker> {
     }
 }
 
-class WitchstalkerTriggeredAbility extends TriggeredAbilityImpl<WitchstalkerTriggeredAbility> {
+class WitchstalkerTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCard filter = new FilterCard("blue or black spell");
     static {
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java
index dc4413b40a6..bfed4613f82 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/Larceny.java
@@ -68,7 +68,7 @@ public class Larceny extends CardImpl<Larceny> {
     }
 }
 
-class LarcenyTriggeredAbility extends TriggeredAbilityImpl<LarcenyTriggeredAbility> {
+class LarcenyTriggeredAbility extends TriggeredAbilityImpl {
 
     public LarcenyTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DiscardTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java
index 02ee6c08b7b..ca53bf9cda5 100644
--- a/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java
+++ b/Mage.Sets/src/mage/sets/mercadianmasques/PiousWarrior.java
@@ -73,7 +73,7 @@ public class PiousWarrior extends CardImpl<PiousWarrior> {
     }
 }
 
-class PiousWarriorTriggeredAbility extends TriggeredAbilityImpl<PiousWarriorTriggeredAbility> {
+class PiousWarriorTriggeredAbility extends TriggeredAbilityImpl {
 
     public PiousWarriorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PiousWarriorGainLifeEffect());
diff --git a/Mage.Sets/src/mage/sets/mirage/AmberPrison.java b/Mage.Sets/src/mage/sets/mirage/AmberPrison.java
index ce6d31ac120..462c4ef7abf 100644
--- a/Mage.Sets/src/mage/sets/mirage/AmberPrison.java
+++ b/Mage.Sets/src/mage/sets/mirage/AmberPrison.java
@@ -160,7 +160,7 @@ class AmberPrisonRestrictionEffect extends RestrictionEffect<AmberPrisonRestrict
 }
 
 
-class AmberPrisonUntapTriggeredAbility extends TriggeredAbilityImpl<AmberPrisonUntapTriggeredAbility> {
+class AmberPrisonUntapTriggeredAbility extends TriggeredAbilityImpl {
 
     public AmberPrisonUntapTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AmberPrisonReleaseOnUntapEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java b/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java
index 45daa157bbf..37574182ead 100644
--- a/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java
+++ b/Mage.Sets/src/mage/sets/mirage/RockBasilisk.java
@@ -74,7 +74,7 @@ public class RockBasilisk extends CardImpl<RockBasilisk> {
     }
 }
 
-class RockBasiliskTriggeredAbility extends TriggeredAbilityImpl<RockBasiliskTriggeredAbility> {
+class RockBasiliskTriggeredAbility extends TriggeredAbilityImpl {
 
     RockBasiliskTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RockBasiliskEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java b/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
index c56840eac03..d9e9dc4a643 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/BansheesBlade.java
@@ -76,7 +76,7 @@ public class BansheesBlade extends CardImpl<BansheesBlade> {
     }
 }
 
-class BansheesBladeAbility extends TriggeredAbilityImpl<BansheesBladeAbility> {
+class BansheesBladeAbility extends TriggeredAbilityImpl {
 
     public BansheesBladeAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.CHARGE.createInstance(1)));
diff --git a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
index 15a17d75d36..0b956163c25 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/ChaliceOfTheVoid.java
@@ -106,7 +106,7 @@ class ChaliceOfTheVoidEffect extends OneShotEffect<ChaliceOfTheVoidEffect> {
     }
 }
 
-class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl<ChaliceOfTheVoidTriggeredAbility> {
+class ChaliceOfTheVoidTriggeredAbility extends TriggeredAbilityImpl {
    
 
     public ChaliceOfTheVoidTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
index 09e001187ee..4e32447be5d 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/FarsightMask.java
@@ -68,7 +68,7 @@ public class FarsightMask extends CardImpl<FarsightMask> {
     }
 }
 
-class FarsightMaskTriggeredAbility extends TriggeredAbilityImpl<FarsightMaskTriggeredAbility> {
+class FarsightMaskTriggeredAbility extends TriggeredAbilityImpl {
 
     public FarsightMaskTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ConditionalOneShotEffect(new DrawCardSourceControllerEffect(1), new FarsightMaskCondition(), ""), false);
diff --git a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
index 1ea555d7e8b..227747c9587 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/Glimmervoid.java
@@ -66,7 +66,7 @@ public class Glimmervoid extends CardImpl<Glimmervoid> {
     }
 }
 
-class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl<GlimmervoidTriggeredAbility> {
+class GlimmervoidTriggeredAbility extends TriggeredAbilityImpl {
 
     GlimmervoidTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java b/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
index 1ff09d6a843..dc10e3b8ff5 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/MesmericOrb.java
@@ -66,7 +66,7 @@ public class MesmericOrb extends CardImpl<MesmericOrb> {
     }
 }
 
-class BecomesUntappedPermanentTriggeredAbility extends TriggeredAbilityImpl<BecomesUntappedPermanentTriggeredAbility>{
+class BecomesUntappedPermanentTriggeredAbility extends TriggeredAbilityImpl{
 
     public BecomesUntappedPermanentTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
index 4ba4f2f2a18..db8aa197814 100644
--- a/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
+++ b/Mage.Sets/src/mage/sets/mirrodin/SwordOfKaldra.java
@@ -77,7 +77,7 @@ public class SwordOfKaldra extends CardImpl<SwordOfKaldra> {
     }
 }
 
-class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl<SwordOfKaldraTriggeredAbility> {
+class SwordOfKaldraTriggeredAbility extends TriggeredAbilityImpl {
 
     public SwordOfKaldraTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ExileTargetEffect("exile that creature"), false);
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java
index 5c84b4003f4..135625b0984 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ConsecratedSphinx.java
@@ -69,7 +69,7 @@ public class ConsecratedSphinx extends CardImpl<ConsecratedSphinx> {
 
 }
 
-class ConsecratedSphinxTriggeredAbility extends TriggeredAbilityImpl<ConsecratedSphinxTriggeredAbility> {
+class ConsecratedSphinxTriggeredAbility extends TriggeredAbilityImpl {
     ConsecratedSphinxTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(2), true);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java
index 603a415052d..c86a630092a 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ContestedWarZone.java
@@ -81,7 +81,7 @@ public class ContestedWarZone extends CardImpl<ContestedWarZone> {
 
 }
 
-class ContestedWarZoneAbility extends TriggeredAbilityImpl<ContestedWarZoneAbility> {
+class ContestedWarZoneAbility extends TriggeredAbilityImpl {
 
     public ContestedWarZoneAbility() {
         super(Zone.BATTLEFIELD, new ContestedWarZoneEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
index ca5da15d8b7..908a515ba82 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/GlissaTheTraitor.java
@@ -81,7 +81,7 @@ public class GlissaTheTraitor extends CardImpl<GlissaTheTraitor> {
 
 }
 
-class GlissaTheTraitorTriggeredAbility extends TriggeredAbilityImpl<GlissaTheTraitorTriggeredAbility> {
+class GlissaTheTraitorTriggeredAbility extends TriggeredAbilityImpl {
     private static final FilterCard filter = new FilterCard("artifact card from your graveyard");
 
     static {
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java
index 043261b5ca4..341b9ce0c50 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/KnowledgePool.java
@@ -107,7 +107,7 @@ class KnowledgePoolEffect1 extends OneShotEffect<KnowledgePoolEffect1> {
 
 }
 
-class KnowledgePoolAbility extends TriggeredAbilityImpl<KnowledgePoolAbility> {
+class KnowledgePoolAbility extends TriggeredAbilityImpl {
 
     public KnowledgePoolAbility() {
         super(Zone.BATTLEFIELD, new KnowledgePoolEffect2(), false);
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java
index 17aee65ea9d..b55197e17f7 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MagneticMine.java
@@ -66,7 +66,7 @@ public class MagneticMine extends CardImpl<MagneticMine> {
     }
 }
 
-class MagneticMineTriggeredAbility extends TriggeredAbilityImpl<MagneticMineTriggeredAbility> {
+class MagneticMineTriggeredAbility extends TriggeredAbilityImpl {
 
     public MagneticMineTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
index 90488fd53f1..f3827cddad9 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/MassacreWurm.java
@@ -75,7 +75,7 @@ public class MassacreWurm extends CardImpl<MassacreWurm> {
 
 }
 
-class MassacreWurmTriggeredAbility extends TriggeredAbilityImpl<MassacreWurmTriggeredAbility> {
+class MassacreWurmTriggeredAbility extends TriggeredAbilityImpl {
     MassacreWurmTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Mirrorworks.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Mirrorworks.java
index 2d5363ce94a..642b25f2c5a 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Mirrorworks.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Mirrorworks.java
@@ -74,7 +74,7 @@ public class Mirrorworks extends CardImpl<Mirrorworks> {
 
 }
 
-class MirrorworksAbility extends TriggeredAbilityImpl<MirrorworksAbility> {
+class MirrorworksAbility extends TriggeredAbilityImpl {
 
     public MirrorworksAbility() {
         super(Zone.BATTLEFIELD, new MirrorworksEffect());
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java
index 403ca0a2a1d..b10e6501453 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/NestedGhoul.java
@@ -68,7 +68,7 @@ public class NestedGhoul extends CardImpl<NestedGhoul> {
 
 }
 
-class NestedGhoulTriggeredAbility extends TriggeredAbilityImpl<NestedGhoulTriggeredAbility> {
+class NestedGhoulTriggeredAbility extends TriggeredAbilityImpl {
     NestedGhoulTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieToken("MBS")));
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
index 985c4ee258c..85dd0fe0510 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/Sangromancer.java
@@ -72,7 +72,7 @@ public class Sangromancer extends CardImpl<Sangromancer> {
     }
 }
 
-class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl<SangromancerFirstTriggeredAbility> {
+class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl {
     SangromancerFirstTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(3), true);
     }
@@ -103,7 +103,7 @@ class SangromancerFirstTriggeredAbility extends TriggeredAbilityImpl<Sangromance
     }
 }
 
-class SangromancerSecondTriggeredAbility extends TriggeredAbilityImpl<SangromancerSecondTriggeredAbility> {
+class SangromancerSecondTriggeredAbility extends TriggeredAbilityImpl {
     SangromancerSecondTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(3), true);
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java
index 4cb8773d55c..d815b7c6cc2 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SepticRats.java
@@ -72,7 +72,7 @@ public class SepticRats extends CardImpl<SepticRats> {
     }
 }
 
-class SepticRatsTriggeredAbility extends TriggeredAbilityImpl<SepticRatsTriggeredAbility> {
+class SepticRatsTriggeredAbility extends TriggeredAbilityImpl {
     SepticRatsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn));
     }
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java
index a45fd996491..e5a331e4513 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java
@@ -70,7 +70,7 @@ public class SignalPest extends CardImpl<SignalPest> {
     }
 }
 
-class SignalPestAbility extends EvasionAbility<SignalPestAbility> {
+class SignalPestAbility extends EvasionAbility {
 
     private static SignalPestAbility instance;
 
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java
index 9025efc60de..bbbaced615a 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java
@@ -90,7 +90,7 @@ public class SwordOfFeastAndFamine extends CardImpl<SwordOfFeastAndFamine> {
     }
 }
 
-class SwordOfFeastAndFamineAbility extends TriggeredAbilityImpl<SwordOfFeastAndFamineAbility> {
+class SwordOfFeastAndFamineAbility extends TriggeredAbilityImpl {
 
     public SwordOfFeastAndFamineAbility() {
         super(Zone.BATTLEFIELD, new DiscardTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java
index 63d5803c4d3..685b3ff5362 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/ThopterAssembly.java
@@ -77,7 +77,7 @@ public class ThopterAssembly extends CardImpl<ThopterAssembly> {
     }
 }
 
-class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl<ThopterAssemblyTriggeredAbility> {
+class ThopterAssemblyTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterPermanent();
     static {
diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java
index a22897c8bf5..a4f5b6f7ac4 100644
--- a/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java
+++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/VirulentWound.java
@@ -102,7 +102,7 @@ class VirulentWoundEffect extends OneShotEffect<VirulentWoundEffect> {
     }
 }
 
-class VirulentWoundDelayedTriggeredAbility extends DelayedTriggeredAbility<VirulentWoundDelayedTriggeredAbility> {
+class VirulentWoundDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID target;
 
diff --git a/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java b/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java
index d4c31390768..85456a77612 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/AuntiesSnitch.java
@@ -81,7 +81,7 @@ public class AuntiesSnitch extends CardImpl<AuntiesSnitch> {
     }
 }
 
-class AuntiesSnitchTriggeredAbility extends TriggeredAbilityImpl<AuntiesSnitchTriggeredAbility> {
+class AuntiesSnitchTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin or Rogue you control");
     static {
diff --git a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java
index 10f588cdf7f..262a99951fe 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/DreamspoilerWitches.java
@@ -74,7 +74,7 @@ public class DreamspoilerWitches extends CardImpl<DreamspoilerWitches> {
     }
 }
 
-class DreamspoilerWitchesTriggeredAbility extends TriggeredAbilityImpl<DreamspoilerWitchesTriggeredAbility> {
+class DreamspoilerWitchesTriggeredAbility extends TriggeredAbilityImpl {
     DreamspoilerWitchesTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostTargetEffect(-1,-1, Duration.EndOfTurn), true);
         this.addTarget(new TargetCreaturePermanent(true));
diff --git a/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java b/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java
index 328d6265684..cb249ef7f2f 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/Imperiosaur.java
@@ -73,7 +73,7 @@ public class Imperiosaur extends CardImpl<Imperiosaur> {
     }
 }
 
-class ImperiosaurStaticAbility extends StaticAbility<ImperiosaurStaticAbility> {
+class ImperiosaurStaticAbility extends StaticAbility {
 
     public ImperiosaurStaticAbility() {
         super(Zone.STACK, null);
diff --git a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java
index 429987fca1b..94958c54a02 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/MoltenDisaster.java
@@ -83,7 +83,7 @@ public class MoltenDisaster extends CardImpl<MoltenDisaster> {
     }
 }
 
-class MoltenDisasterTriggeredAbility extends TriggeredAbilityImpl<MoltenDisasterTriggeredAbility> {
+class MoltenDisasterTriggeredAbility extends TriggeredAbilityImpl {
 
     public MoltenDisasterTriggeredAbility() {
         super(Zone.HAND, new GainAbilitySourceEffect(new SplitSecondAbility(), Duration.WhileOnStack), false);
diff --git a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
index 29ec4f62b1d..7a24d78ef8e 100644
--- a/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
+++ b/Mage.Sets/src/mage/sets/modernmasters/TrygonPredator.java
@@ -79,7 +79,7 @@ public class TrygonPredator extends CardImpl<TrygonPredator> {
     }
 }
 
-class TrygonPredatorTriggeredAbility extends TriggeredAbilityImpl<TrygonPredatorTriggeredAbility> {
+class TrygonPredatorTriggeredAbility extends TriggeredAbilityImpl {
 
     public TrygonPredatorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java
index 984db6fdc91..c2a03e278ef 100644
--- a/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java
+++ b/Mage.Sets/src/mage/sets/morningtide/CountrysideCrusher.java
@@ -125,7 +125,7 @@ class CountrysideCrusherEffect extends OneShotEffect<CountrysideCrusherEffect> {
 }
 
 
-class CountrysideCrusherTriggeredAbility extends TriggeredAbilityImpl<CountrysideCrusherTriggeredAbility> {
+class CountrysideCrusherTriggeredAbility extends TriggeredAbilityImpl {
 
     public CountrysideCrusherTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), false);
diff --git a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
index c2d80a54332..612ee496742 100644
--- a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
+++ b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
@@ -85,7 +85,7 @@ public class GreatbowDoyen extends CardImpl<GreatbowDoyen> {
     }
 }
 
-class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl<GreatbowDoyenTriggeredAbility> {
+class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl {
 
     public GreatbowDoyenTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GreatbowDoyenEffect());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
index 24fdca0a157..08767f878ca 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ArmWithAEther.java
@@ -72,7 +72,7 @@ public class ArmWithAEther extends CardImpl<ArmWithAEther> {
     }
 }
 
-class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl<ArmWithAEtherTriggeredAbility> {
+class ArmWithAEtherTriggeredAbility extends TriggeredAbilityImpl {
 
     public ArmWithAEtherTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
index e229875c2fa..817ab0482e6 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/BlindZealot.java
@@ -79,7 +79,7 @@ public class BlindZealot extends CardImpl<BlindZealot> {
     }
 }
 
-class BlindZealotTriggeredAbility extends TriggeredAbilityImpl<BlindZealotTriggeredAbility> {
+class BlindZealotTriggeredAbility extends TriggeredAbilityImpl {
 
     public BlindZealotTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BlindZealotEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java
index db86f9b4604..e659be85097 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/BludgeonBrawl.java
@@ -78,7 +78,7 @@ public class BludgeonBrawl extends CardImpl<BludgeonBrawl> {
     }
 }
 
-class BludgeonBrawlAbility extends StaticAbility<BludgeonBrawlAbility> {
+class BludgeonBrawlAbility extends StaticAbility {
 
     public BludgeonBrawlAbility() {
         super(Zone.BATTLEFIELD, new BludgeonBrawlAddSubtypeEffect());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java
index 6d7a87254a5..6a801f913aa 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheAnnex.java
@@ -108,7 +108,7 @@ class ChancellorOfTheAnnexEffect extends OneShotEffect<ChancellorOfTheAnnexEffec
 
 }
 
-class ChancellorOfTheAnnexDelayedTriggeredAbility extends DelayedTriggeredAbility<ChancellorOfTheAnnexDelayedTriggeredAbility> {
+class ChancellorOfTheAnnexDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID playerId;
 
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java
index dc24465988c..e9d3bd01a0f 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheDross.java
@@ -76,7 +76,7 @@ public class ChancellorOfTheDross extends CardImpl<ChancellorOfTheDross> {
     }
 }
 
-class ChancellorOfTheDrossDelayedTriggeredAbility extends DelayedTriggeredAbility<ChancellorOfTheDrossDelayedTriggeredAbility> {
+class ChancellorOfTheDrossDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     ChancellorOfTheDrossDelayedTriggeredAbility () {
         super(new ChancellorOfTheDrossEffect());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java
index 38e35d2f125..b028655500c 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheForge.java
@@ -86,7 +86,7 @@ public class ChancellorOfTheForge extends CardImpl<ChancellorOfTheForge> {
     }
 }
 
-class ChancellorOfTheForgeDelayedTriggeredAbility extends DelayedTriggeredAbility<ChancellorOfTheForgeDelayedTriggeredAbility> {
+class ChancellorOfTheForgeDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     ChancellorOfTheForgeDelayedTriggeredAbility () {
         super(new CreateTokenEffect(new GoblinToken()));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java
index ded45bb311a..fd7487a4680 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheSpires.java
@@ -96,7 +96,7 @@ public class ChancellorOfTheSpires extends CardImpl<ChancellorOfTheSpires> {
     }
 }
 
-class ChancellorOfTheSpiresDelayedTriggeredAbility extends DelayedTriggeredAbility<ChancellorOfTheSpiresDelayedTriggeredAbility> {
+class ChancellorOfTheSpiresDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     ChancellorOfTheSpiresDelayedTriggeredAbility () {
         super(new ChancellorOfTheSpiresEffect());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java
index 2c1cebb2d76..889b7785224 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ChancellorOfTheTangle.java
@@ -75,7 +75,7 @@ public class ChancellorOfTheTangle extends CardImpl<ChancellorOfTheTangle> {
     }
 }
 
-class ChancellorOfTheTangleDelayedTriggeredAbility extends DelayedTriggeredAbility<ChancellorOfTheTangleDelayedTriggeredAbility> {
+class ChancellorOfTheTangleDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     ChancellorOfTheTangleDelayedTriggeredAbility () {
         super(new BasicManaEffect(Mana.GreenMana));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
index 3ac3c3f9f88..b6685f4ef72 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/InvaderParasite.java
@@ -105,7 +105,7 @@ class InvaderParasiteImprintEffect extends OneShotEffect<InvaderParasiteImprintE
     }
 }
 
-class InvaderParasiteTriggeredAbility extends TriggeredAbilityImpl<InvaderParasiteTriggeredAbility> {
+class InvaderParasiteTriggeredAbility extends TriggeredAbilityImpl {
     InvaderParasiteTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java b/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java
index 17ad6bf24cc..b849b43a13b 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/IsolationCell.java
@@ -67,7 +67,7 @@ public class IsolationCell extends CardImpl<IsolationCell> {
     }
 }
 
-class IsolationCellTriggeredAbility extends TriggeredAbilityImpl<IsolationCellTriggeredAbility> {
+class IsolationCellTriggeredAbility extends TriggeredAbilityImpl {
 
     public IsolationCellTriggeredAbility() {
         super(Zone.BATTLEFIELD, new IsolationCellEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java
index 0d9c42331f5..59e6bc1b424 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/KarnLiberated.java
@@ -159,7 +159,7 @@ class KarnLiberatedEffect extends OneShotEffect<KarnLiberatedEffect> {
 
 }
 
-class KarnLiberatedDelayedTriggeredAbility extends DelayedTriggeredAbility<KarnLiberatedDelayedTriggeredAbility> {
+class KarnLiberatedDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public KarnLiberatedDelayedTriggeredAbility(UUID exileId) {
         super(new KarnLiberatedDelayedEffect(exileId));
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java
index 8308a21b7fc..32d4f0ddb66 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/Mindcrank.java
@@ -67,7 +67,7 @@ public class Mindcrank extends CardImpl<Mindcrank> {
     }
 }
 
-class MindcrankTriggeredAbility extends TriggeredAbilityImpl<MindcrankTriggeredAbility> {
+class MindcrankTriggeredAbility extends TriggeredAbilityImpl {
 
     public MindcrankTriggeredAbility() {
         super(Zone.BATTLEFIELD, new MindcrankEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java b/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java
index fddf8737532..fec6d7743dd 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/MyrSuperion.java
@@ -68,7 +68,7 @@ public class MyrSuperion extends CardImpl<MyrSuperion> {
     }
 }
 
-class MyrSuperionStaticAbility extends StaticAbility<MyrSuperionStaticAbility> {
+class MyrSuperionStaticAbility extends StaticAbility {
 
     public MyrSuperionStaticAbility() {
         super(Zone.STACK, null);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
index 54d06614200..8e48a145dae 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/NumbingDose.java
@@ -88,7 +88,7 @@ public class NumbingDose extends CardImpl<NumbingDose> {
     }
 }
 
-class NumbingDoseTriggeredAbility extends TriggeredAbilityImpl<NumbingDoseTriggeredAbility> {
+class NumbingDoseTriggeredAbility extends TriggeredAbilityImpl {
 
     public NumbingDoseTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java b/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java
index 4ccf3b64b8a..3d1bd9cb7be 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/OmenMachine.java
@@ -109,7 +109,7 @@ class OmenMachineEffect extends ReplacementEffectImpl<OmenMachineEffect> {
 
 }
 
-class OmenMachineAbility extends TriggeredAbilityImpl<OmenMachineAbility> {
+class OmenMachineAbility extends TriggeredAbilityImpl {
 
     public OmenMachineAbility() {
         super(Zone.BATTLEFIELD, new OmenMachineEffect2());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java
index d4bb406b527..caac3014b1d 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianObliterator.java
@@ -73,7 +73,7 @@ public class PhyrexianObliterator extends CardImpl<PhyrexianObliterator> {
     }
 }
 
-class PhyrexianObliteratorTriggeredAbility extends TriggeredAbilityImpl<PhyrexianObliteratorTriggeredAbility> {
+class PhyrexianObliteratorTriggeredAbility extends TriggeredAbilityImpl {
     PhyrexianObliteratorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 0, ""));
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java
index 8c5695af6b7..1b57469daab 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/PsychicSurgery.java
@@ -70,7 +70,7 @@ public class PsychicSurgery extends CardImpl<PsychicSurgery> {
     }
 }
 
-class PsychicSurgeryTriggeredAbility extends TriggeredAbilityImpl<PsychicSurgeryTriggeredAbility> {
+class PsychicSurgeryTriggeredAbility extends TriggeredAbilityImpl {
 
     public PsychicSurgeryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PsychicSurgeryEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java
index 4834d26277b..5f84c36cc17 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/RageExtractor.java
@@ -67,7 +67,7 @@ public class RageExtractor extends CardImpl<RageExtractor> {
     }
 }
 
-class RageExtractorTriggeredAbility extends TriggeredAbilityImpl<RageExtractorTriggeredAbility> {
+class RageExtractorTriggeredAbility extends TriggeredAbilityImpl {
     RageExtractorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(0));
         this.addTarget(new TargetCreatureOrPlayer());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java
index 21a1476227b..c2b1ed08d14 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/ReaperOfSheoldred.java
@@ -72,7 +72,7 @@ public class ReaperOfSheoldred extends CardImpl<ReaperOfSheoldred> {
     }
 }
 
-class ReaperOfSheoldredTriggeredAbility extends TriggeredAbilityImpl<ReaperOfSheoldredTriggeredAbility> {
+class ReaperOfSheoldredTriggeredAbility extends TriggeredAbilityImpl {
     ReaperOfSheoldredTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.POISON.createInstance()));
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
index bc026942a70..eb5bd5ed814 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/SuturePriest.java
@@ -86,7 +86,7 @@ public class SuturePriest extends CardImpl<SuturePriest> {
     }
 }
 
-class SuturePriestSecondTriggeredAbility extends TriggeredAbilityImpl<SuturePriestSecondTriggeredAbility> {
+class SuturePriestSecondTriggeredAbility extends TriggeredAbilityImpl {
     SuturePriestSecondTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), true);
     }
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java
index 3a2917377d6..355d19b4634 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/SwordOfWarAndPeace.java
@@ -92,7 +92,7 @@ public class SwordOfWarAndPeace extends CardImpl<SwordOfWarAndPeace> {
 
 }
 
-class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl<SwordOfWarAndPeaceAbility> {
+class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
 
     public SwordOfWarAndPeaceAbility() {
         super(Zone.BATTLEFIELD, new SwordOfWarAndPeaceDamageEffect());
diff --git a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
index 71c55cc867a..2a9fc8e926d 100644
--- a/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
+++ b/Mage.Sets/src/mage/sets/newphyrexia/VorinclexVoiceOfHunger.java
@@ -197,7 +197,7 @@ class VorinclexEffect extends ManaEffect<VorinclexEffect> {
 
 }
 
-class VorinclexTriggeredAbility2 extends TriggeredAbilityImpl<VorinclexTriggeredAbility2> {
+class VorinclexTriggeredAbility2 extends TriggeredAbilityImpl {
 
     private static final String staticText = "Whenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.";
 
diff --git a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java
index ff88cb062b7..e4c3a74e3ab 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/Deathgazer.java
@@ -71,7 +71,7 @@ public class Deathgazer extends CardImpl<Deathgazer> {
     }
 }
 
-class DeathgazerTriggeredAbility extends TriggeredAbilityImpl<DeathgazerTriggeredAbility> {
+class DeathgazerTriggeredAbility extends TriggeredAbilityImpl {
 
     
     
diff --git a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java
index 31f78f77ee2..63179659d7c 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/GravePact.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/GravePact.java
@@ -70,7 +70,7 @@ public class GravePact extends CardImpl<GravePact> {
     }
 }
 
-class GravePactTriggeredAbility extends TriggeredAbilityImpl<GravePactTriggeredAbility> {
+class GravePactTriggeredAbility extends TriggeredAbilityImpl {
 
     public GravePactTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GravePactEffect());
diff --git a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java
index b2bd30a4066..d492ee73b74 100644
--- a/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java
+++ b/Mage.Sets/src/mage/sets/ninthedition/ViashinoSandstalker.java
@@ -76,7 +76,7 @@ public class ViashinoSandstalker extends CardImpl<ViashinoSandstalker> {
     }
 }
 
-class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl<BeginningOfEndStepTriggeredAbility> {
+class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl {
 
     public BeginningOfEndStepTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java b/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java
index 39da97b6f00..7030f966cf8 100644
--- a/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java
+++ b/Mage.Sets/src/mage/sets/odyssey/BattleStrain.java
@@ -65,7 +65,7 @@ public class BattleStrain extends CardImpl<BattleStrain> {
     }
 }
 
-class BattleStrainTriggeredAbility extends TriggeredAbilityImpl<BattleStrainTriggeredAbility> {
+class BattleStrainTriggeredAbility extends TriggeredAbilityImpl {
 
     public BattleStrainTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java
index fe4aa40b1cb..3c0d578772e 100644
--- a/Mage.Sets/src/mage/sets/odyssey/BombSquad.java
+++ b/Mage.Sets/src/mage/sets/odyssey/BombSquad.java
@@ -96,7 +96,7 @@ public class BombSquad extends CardImpl<BombSquad> {
     }
 }
 
-class BombSquadTriggeredAbility extends TriggeredAbilityImpl<BombSquadTriggeredAbility> {
+class BombSquadTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java
index 99cc0b61ecd..243fc19d8df 100644
--- a/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java
+++ b/Mage.Sets/src/mage/sets/odyssey/CabalInquisitor.java
@@ -87,7 +87,7 @@ public class CabalInquisitor extends CardImpl<CabalInquisitor> {
 }
 
 
-class ActivateAsSorceryConditionalActivatedAbility extends ActivatedAbilityImpl<ActivateAsSorceryConditionalActivatedAbility> {
+class ActivateAsSorceryConditionalActivatedAbility extends ActivatedAbilityImpl {
     
     private Condition condition;
     private String ruleText = "<i>Threshold<i/> - {1}{B}, {t}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard.";
diff --git a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java
index e14d94ebb9a..45c35da0ab1 100644
--- a/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java
+++ b/Mage.Sets/src/mage/sets/odyssey/DecayingSoil.java
@@ -101,7 +101,7 @@ public class DecayingSoil extends CardImpl<DecayingSoil> {
     }
 }
 
-class DecayingSoilTriggeredAbility extends TriggeredAbilityImpl<DecayingSoilTriggeredAbility> {
+class DecayingSoilTriggeredAbility extends TriggeredAbilityImpl {
 
     protected FilterCreaturePermanent filter;
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java
index d35ca76d4b0..f8884e6985b 100644
--- a/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java
+++ b/Mage.Sets/src/mage/sets/odyssey/DruidsCall.java
@@ -82,7 +82,7 @@ public class DruidsCall extends CardImpl<DruidsCall> {
     }
 }
 
-class DruidsCallTriggeredAbility extends TriggeredAbilityImpl<DruidsCallTriggeredAbility> {
+class DruidsCallTriggeredAbility extends TriggeredAbilityImpl {
 
     public DruidsCallTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DruidsCallEffect());
diff --git a/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java b/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java
index 07b3e780f74..07f8deec91c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java
+++ b/Mage.Sets/src/mage/sets/odyssey/FilthyCur.java
@@ -69,7 +69,7 @@ public class FilthyCur extends CardImpl<FilthyCur> {
     }
 }
 
-class DealtDamageLoseLifeTriggeredAbility extends TriggeredAbilityImpl<DealtDamageLoseLifeTriggeredAbility> {
+class DealtDamageLoseLifeTriggeredAbility extends TriggeredAbilityImpl {
 
     public DealtDamageLoseLifeTriggeredAbility(Zone zone, Effect effect, boolean optional) {
         super(zone, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java b/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java
index 87bd279529f..cf11e3a430a 100644
--- a/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java
+++ b/Mage.Sets/src/mage/sets/odyssey/PriceOfGlory.java
@@ -67,7 +67,7 @@ public class PriceOfGlory extends CardImpl<PriceOfGlory> {
     }
 }
 
-class PriceOfGloryAbility extends TriggeredAbilityImpl<PriceOfGloryAbility> {
+class PriceOfGloryAbility extends TriggeredAbilityImpl {
 
     private static final String staticText = "Whenever a player taps a land for mana, if it's not that player's turn, destroy that land.";
 
diff --git a/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java b/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java
index 7c12a16b5b5..5666efa1170 100644
--- a/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java
+++ b/Mage.Sets/src/mage/sets/odyssey/SavageFirecat.java
@@ -79,7 +79,7 @@ public class SavageFirecat extends CardImpl<SavageFirecat> {
     }
 }
 
-class SavageFirecatTriggeredAbility extends TriggeredAbilityImpl<SavageFirecatTriggeredAbility> {
+class SavageFirecatTriggeredAbility extends TriggeredAbilityImpl {
 
     public SavageFirecatTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
index 0baf0903e65..6383a1d2761 100644
--- a/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
+++ b/Mage.Sets/src/mage/sets/odyssey/SparkMage.java
@@ -73,7 +73,7 @@ public class SparkMage extends CardImpl<SparkMage> {
     }
 }
 
-class SparkMageTriggeredAbility extends TriggeredAbilityImpl<SparkMageTriggeredAbility> {
+class SparkMageTriggeredAbility extends TriggeredAbilityImpl {
 
     public SparkMageTriggeredAbility(){
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java
index 1587cbcd38d..021e2b20e00 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Spiritualize.java
@@ -74,7 +74,7 @@ public class Spiritualize extends CardImpl<Spiritualize> {
     }
 }
 
-class SpiritualizeTriggeredAbility extends DelayedTriggeredAbility<SpiritualizeTriggeredAbility> {
+class SpiritualizeTriggeredAbility extends DelayedTriggeredAbility {
 
     public SpiritualizeTriggeredAbility() {
         super(new SpiritualizeEffect(), Duration.EndOfTurn, false);
diff --git a/Mage.Sets/src/mage/sets/odyssey/Standstill.java b/Mage.Sets/src/mage/sets/odyssey/Standstill.java
index 1caf46c6a79..f7cf947c37c 100644
--- a/Mage.Sets/src/mage/sets/odyssey/Standstill.java
+++ b/Mage.Sets/src/mage/sets/odyssey/Standstill.java
@@ -68,7 +68,7 @@ public class Standstill extends CardImpl<Standstill> {
     }
 }
 
-class SpellCastTriggeredAbility extends TriggeredAbilityImpl<SpellCastTriggeredAbility> {
+class SpellCastTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpellCastTriggeredAbility() {
         super(Zone.BATTLEFIELD, new StandstillEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java
index ffc3fdc3187..6920c62c0ca 100644
--- a/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java
+++ b/Mage.Sets/src/mage/sets/onslaught/AstralSlide.java
@@ -74,7 +74,7 @@ public class AstralSlide extends CardImpl<AstralSlide> {
 }
 
 
-class AstralSlideTriggeredAbility extends TriggeredAbilityImpl<AstralSlideTriggeredAbility> {
+class AstralSlideTriggeredAbility extends TriggeredAbilityImpl {
 
     public AstralSlideTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AstralSlideEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java
index 431a8549416..e919de97c8e 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/PorphyryNodes.java
@@ -138,7 +138,7 @@ class PorphyryNodesEffect extends OneShotEffect<PorphyryNodesEffect> {
     }
 }
 
-class PorphyryNodesStateTriggeredAbility extends StateTriggeredAbility<PorphyryNodesStateTriggeredAbility> {
+class PorphyryNodesStateTriggeredAbility extends StateTriggeredAbility {
 
     public PorphyryNodesStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java
index 1282e6e568f..af8eb0003b6 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/PollenbrightWings.java
@@ -90,7 +90,7 @@ public class PollenbrightWings extends CardImpl<PollenbrightWings> {
     }
 }
 
-class PollenbrightWingsAbility extends TriggeredAbilityImpl<PollenbrightWingsAbility> {
+class PollenbrightWingsAbility extends TriggeredAbilityImpl {
 
     public PollenbrightWingsAbility() {
         super(Zone.BATTLEFIELD, new PollenbrightWingsEffect());
diff --git a/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java b/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java
index bf6938a6c91..21cb5633984 100644
--- a/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java
+++ b/Mage.Sets/src/mage/sets/ravnika/BelltowerSphinx.java
@@ -72,7 +72,7 @@ public class BelltowerSphinx extends CardImpl<BelltowerSphinx> {
     }
 }
 
-class BelltowerSphinxEffect extends TriggeredAbilityImpl<BelltowerSphinxEffect> {
+class BelltowerSphinxEffect extends TriggeredAbilityImpl {
 
     public BelltowerSphinxEffect() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0));
diff --git a/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java b/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java
index 3f7864cdc44..325d5b0d222 100644
--- a/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java
+++ b/Mage.Sets/src/mage/sets/ravnika/BrambleElemental.java
@@ -70,7 +70,7 @@ public class BrambleElemental extends CardImpl<BrambleElemental> {
     }
 }
 
-class AttachedTriggeredAbility extends TriggeredAbilityImpl<AttachedTriggeredAbility> {
+class AttachedTriggeredAbility extends TriggeredAbilityImpl {
 
     public AttachedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java
index 7bc5ec75764..357c8805c0d 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/AshZealot.java
@@ -81,7 +81,7 @@ public class AshZealot extends CardImpl<AshZealot> {
     }
 }
 
-class AshZealotTriggeredAbility extends TriggeredAbilityImpl<AshZealotTriggeredAbility> {
+class AshZealotTriggeredAbility extends TriggeredAbilityImpl {
 
     public AshZealotTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(3), false);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java
index d9d038eef48..206bb146b60 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/AzorsElocutors.java
@@ -81,7 +81,7 @@ public class AzorsElocutors extends CardImpl<AzorsElocutors> {
         return new AzorsElocutors(this);
     }
 }
-class AzorsElocutorsTriggeredAbility extends TriggeredAbilityImpl<AzorsElocutorsTriggeredAbility> {
+class AzorsElocutorsTriggeredAbility extends TriggeredAbilityImpl {
 
     public AzorsElocutorsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RemoveCounterSourceEffect(new Counter("filibuster")), false);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java
index fb4e2e8dfc6..7371c1ce743 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ChronicFlooding.java
@@ -81,7 +81,7 @@ public class ChronicFlooding extends CardImpl<ChronicFlooding> {
     }
 }
  
-class ChronicFloodingAbility extends TriggeredAbilityImpl<ChronicFloodingAbility> {
+class ChronicFloodingAbility extends TriggeredAbilityImpl {
     ChronicFloodingAbility() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3));
     }
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java
index dfbb0aded9e..e336a966f77 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/CrosstownCourier.java
@@ -71,7 +71,7 @@ public class CrosstownCourier extends CardImpl<CrosstownCourier> {
         return new CrosstownCourier(this);
     }
 
-    class CrosstownCourierTriggeredAbility extends TriggeredAbilityImpl<CrosstownCourierTriggeredAbility> {
+    class CrosstownCourierTriggeredAbility extends TriggeredAbilityImpl {
 
         public CrosstownCourierTriggeredAbility() {
             super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(0), false);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java
index cdc8f9cf90c..2521a3cad45 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/DeathsPresence.java
@@ -68,7 +68,7 @@ public class DeathsPresence extends CardImpl<DeathsPresence> {
     }
 }
 
-class DeathsPresenceTriggeredAbility extends TriggeredAbilityImpl<DeathsPresenceTriggeredAbility> {
+class DeathsPresenceTriggeredAbility extends TriggeredAbilityImpl {
 
     public DeathsPresenceTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java
index 199c0f87220..a67dad51415 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/GraveBetrayal.java
@@ -82,7 +82,7 @@ public class GraveBetrayal extends CardImpl<GraveBetrayal> {
     }
 }
 
-class GraveBetrayalTriggeredAbility extends TriggeredAbilityImpl<GraveBetrayalTriggeredAbility> {
+class GraveBetrayalTriggeredAbility extends TriggeredAbilityImpl {
 
     public GraveBetrayalTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java
index 0bcb5090996..821aae7e046 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/IsperiaSupremeJudge.java
@@ -77,7 +77,7 @@ public class IsperiaSupremeJudge extends CardImpl<IsperiaSupremeJudge> {
     }
 }
 
-class IsperiaSupremeJudgeTriggeredAbility extends TriggeredAbilityImpl<IsperiaSupremeJudgeTriggeredAbility> {
+class IsperiaSupremeJudgeTriggeredAbility extends TriggeredAbilityImpl {
 
     public IsperiaSupremeJudgeTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java
index c15efab1c87..2264b4da623 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java
@@ -148,7 +148,7 @@ class JaceArchitectOfThoughtGainAbilityEffect extends ContinuousEffectImpl<JaceA
     }
 }
 
-class JaceArchitectOfThoughtTriggeredAbility extends TriggeredAbilityImpl<JaceArchitectOfThoughtTriggeredAbility> {
+class JaceArchitectOfThoughtTriggeredAbility extends TriggeredAbilityImpl {
 
     public JaceArchitectOfThoughtTriggeredAbility() {
         super(Zone.BATTLEFIELD, new JaceArchitectOfThoughtEffectUnboostEffect(-1,0, Duration.EndOfTurn));
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java
index a2aa697db5a..658f44c8566 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/LobberCrew.java
@@ -79,7 +79,7 @@ public class LobberCrew extends CardImpl<LobberCrew> {
     }
 }
 
-class LobberCrewTriggeredAbility extends TriggeredAbilityImpl<LobberCrewTriggeredAbility> {
+class LobberCrewTriggeredAbility extends TriggeredAbilityImpl {
     public LobberCrewTriggeredAbility() {
         super(Zone.BATTLEFIELD, new UntapSourceEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java
index f884606e3f1..573776b6dc4 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/NecropolisRegent.java
@@ -78,7 +78,7 @@ public class NecropolisRegent extends CardImpl<NecropolisRegent> {
     }
 }
 
-class NecropolisRegentTriggeredAbility extends TriggeredAbilityImpl<NecropolisRegentTriggeredAbility> {
+class NecropolisRegentTriggeredAbility extends TriggeredAbilityImpl {
 
     public NecropolisRegentTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), false);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java
index 87a0464b16c..ab41ea92260 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/Pyroconvergence.java
@@ -65,7 +65,7 @@ public class Pyroconvergence extends CardImpl<Pyroconvergence> {
         return new Pyroconvergence(this);
     }
 }
-class PyroconvergenceTriggeredAbility extends TriggeredAbilityImpl<PyroconvergenceTriggeredAbility> {
+class PyroconvergenceTriggeredAbility extends TriggeredAbilityImpl {
     public PyroconvergenceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
         TargetCreatureOrPlayer target = new TargetCreatureOrPlayer();
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java
index bd8ff9f296c..9554fcbfd57 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SearchTheCity.java
@@ -115,7 +115,7 @@ class SearchTheCityExileEffect extends OneShotEffect<SearchTheCityExileEffect> {
 }
 
 
-class SearchTheCityTriggeredAbility extends TriggeredAbilityImpl<SearchTheCityTriggeredAbility> {
+class SearchTheCityTriggeredAbility extends TriggeredAbilityImpl {
 
     public SearchTheCityTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SearchTheCityExiledCardToHandEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java
index af916c91b25..b726cb77f19 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ShriekingAffliction.java
@@ -78,7 +78,7 @@ public class ShriekingAffliction extends CardImpl<ShriekingAffliction> {
     }
 }
 
-class ShriekingAfflictionTriggeredAbility extends TriggeredAbilityImpl<ShriekingAfflictionTriggeredAbility> {
+class ShriekingAfflictionTriggeredAbility extends TriggeredAbilityImpl {
 
     public ShriekingAfflictionTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
index aeb0fd2cece..fb1199183ae 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java
@@ -79,7 +79,7 @@ public class SkymarkRoc extends CardImpl<SkymarkRoc> {
     }
 }
 
-class SkymarkRocAbility extends TriggeredAbilityImpl<SkymarkRocAbility> {
+class SkymarkRocAbility extends TriggeredAbilityImpl {
 
     public SkymarkRocAbility() {
         super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
index eb6b4369eb0..7757ab1eeb1 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/TrostaniSelesnyasVoice.java
@@ -84,7 +84,7 @@ public class TrostaniSelesnyasVoice extends CardImpl<TrostaniSelesnyasVoice> {
     }
 }
 
-class TrostaniSelesnyasVoiceTriggeredAbility extends TriggeredAbilityImpl<TrostaniSelesnyasVoiceTriggeredAbility> {
+class TrostaniSelesnyasVoiceTriggeredAbility extends TriggeredAbilityImpl {
 
     public TrostaniSelesnyasVoiceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TrostaniSelesnyasVoiceEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java b/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java
index 9afa8745a1e..c5b5e71ef81 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/VolatileRig.java
@@ -89,7 +89,7 @@ public class VolatileRig extends CardImpl<VolatileRig> {
     }
 }
 
-class VolatileRigTriggeredAbility extends TriggeredAbilityImpl<VolatileRigTriggeredAbility> {
+class VolatileRigTriggeredAbility extends TriggeredAbilityImpl {
 
     private Boolean triggerdThisCombatStep = false;
 
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java b/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java
index 7765422dd01..3254599e9c0 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/VraskaTheUnseen.java
@@ -184,7 +184,7 @@ class VraskaTheUnseenLoseGameEffect extends OneShotEffect<VraskaTheUnseenLoseGam
     }
 }
 
-class VraskaTheUnseenTriggeredAbility extends TriggeredAbilityImpl<VraskaTheUnseenTriggeredAbility> {
+class VraskaTheUnseenTriggeredAbility extends TriggeredAbilityImpl {
 
     public VraskaTheUnseenTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java
index c57b3d4aa05..101d8a52d24 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/AngelheartVial.java
@@ -79,7 +79,7 @@ public class AngelheartVial extends CardImpl<AngelheartVial> {
     }
 }
 
-class AngelheartVialTriggeredAbility extends TriggeredAbilityImpl<AngelheartVialTriggeredAbility> {
+class AngelheartVialTriggeredAbility extends TriggeredAbilityImpl {
 
     public AngelheartVialTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AngelheartVialEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java
index 7d19e57aa3f..3353b1cc5c8 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ArrogantBloodlord.java
@@ -74,7 +74,7 @@ public class ArrogantBloodlord extends CardImpl<ArrogantBloodlord> {
     }
 }
 
-class ArrogantBloodlordTriggeredAbility extends TriggeredAbilityImpl<ArrogantBloodlordTriggeredAbility> {
+class ArrogantBloodlordTriggeredAbility extends TriggeredAbilityImpl {
 
     ArrogantBloodlordTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ArrogantBloodlordEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java
index c28e366b45d..2c82e0a1d2a 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/BanefulOmen.java
@@ -69,7 +69,7 @@ public class BanefulOmen extends CardImpl<BanefulOmen> {
         return new BanefulOmen(this);
     }
 
-    class BanefulOmenTriggeredAbility extends TriggeredAbilityImpl<BanefulOmenTriggeredAbility> {
+    class BanefulOmenTriggeredAbility extends TriggeredAbilityImpl {
 
         public BanefulOmenTriggeredAbility() {
             super(Zone.BATTLEFIELD, new BanefulOmenEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java
index cc70c2e1d18..c196edfb1b5 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ContaminatedGround.java
@@ -82,7 +82,7 @@ public class ContaminatedGround extends CardImpl<ContaminatedGround> {
     }
 }
 
-class ContaminatedGroundAbility extends TriggeredAbilityImpl<ContaminatedGroundAbility> {
+class ContaminatedGroundAbility extends TriggeredAbilityImpl {
     ContaminatedGroundAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2));
     }
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java
index 493e228e1ce..2169bcb8d65 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java
@@ -109,7 +109,7 @@ class CurseOfWizardryChooseColorEffect extends OneShotEffect<CurseOfWizardryChoo
     }
 }
 
-class CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility extends TriggeredAbilityImpl<CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility> {
+class CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility extends TriggeredAbilityImpl {
 
     public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java
index a4fb32e9b4e..3cac56e40fa 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EmrakulTheAeonsTorn.java
@@ -88,7 +88,7 @@ public class EmrakulTheAeonsTorn extends CardImpl<EmrakulTheAeonsTorn> {
         return new EmrakulTheAeonsTorn(this);
     }
 }
-class EmrakulTheAeonsTornOnCastAbility extends TriggeredAbilityImpl<EmrakulTheAeonsTornOnCastAbility> {
+class EmrakulTheAeonsTornOnCastAbility extends TriggeredAbilityImpl {
 
     private static final String abilityText = "When you cast {this}, take an extra turn after this one";
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java
index 38283f9bbc7..e1180d3885b 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/EvolvingWilds.java
@@ -64,7 +64,7 @@ public class EvolvingWilds extends CardImpl<EvolvingWilds> {
 
 }
 
-class EvolvingWildsAbility extends ActivatedAbilityImpl<EvolvingWildsAbility> {
+class EvolvingWildsAbility extends ActivatedAbilityImpl {
 
     public EvolvingWildsAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java
index 4d076fa933d..c415f18c4f0 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/GravityWell.java
@@ -68,7 +68,7 @@ public class GravityWell extends CardImpl<GravityWell> {
     }
 }
 
-class GravityWellTriggeredAbility extends TriggeredAbilityImpl<GravityWellTriggeredAbility> {
+class GravityWellTriggeredAbility extends TriggeredAbilityImpl {
 
     public GravityWellTriggeredAbility() {
     super(Zone.BATTLEFIELD, new GravityWellEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java
index ff3a646d9bc..5c1055711ba 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/KozilekButcherOfTruth.java
@@ -76,7 +76,7 @@ public class KozilekButcherOfTruth extends CardImpl<KozilekButcherOfTruth> {
 
 }
 
-class KozilekButcherOfTruthOnCastAbility extends TriggeredAbilityImpl<KozilekButcherOfTruthOnCastAbility> {
+class KozilekButcherOfTruthOnCastAbility extends TriggeredAbilityImpl {
 
     private static final String abilityText = "When you cast {this}, draw four cards";
 
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java
index aea74c820de..d92212c026d 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LighthouseChronologist.java
@@ -87,7 +87,7 @@ public class LighthouseChronologist extends LevelerCard<LighthouseChronologist>
 
 }
 
-class LighthouseChronologistAbility extends TriggeredAbilityImpl<LighthouseChronologistAbility> {
+class LighthouseChronologistAbility extends TriggeredAbilityImpl {
 
     public LighthouseChronologistAbility() {
         super(Zone.BATTLEFIELD, new LighthouseChronologistEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java
index 18d7183bd09..92bd3af1665 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/LightmineField.java
@@ -68,7 +68,7 @@ public class LightmineField extends CardImpl<LightmineField> {
     }
 }
 
-class LightmineFieldTriggeredAbility extends TriggeredAbilityImpl<LightmineFieldTriggeredAbility> {
+class LightmineFieldTriggeredAbility extends TriggeredAbilityImpl {
 
     public LightmineFieldTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LightmineFieldEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java
index 5af6152ca46..58d4e75e508 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/MorticianBeetle.java
@@ -72,7 +72,7 @@ public class MorticianBeetle extends CardImpl<MorticianBeetle> {
     }
 }
 
-class PlayerSacrificesCreatureTriggeredAbility extends TriggeredAbilityImpl<PlayerSacrificesCreatureTriggeredAbility> {
+class PlayerSacrificesCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     public PlayerSacrificesCreatureTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java
index 572182b8f28..109d2a26306 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/NirkanaRevenant.java
@@ -81,7 +81,7 @@ public class NirkanaRevenant extends CardImpl<NirkanaRevenant> {
     }
 }
 
-  class NirkanaRevenantTriggeredAbility extends TriggeredAbilityImpl<NirkanaRevenantTriggeredAbility> {
+  class NirkanaRevenantTriggeredAbility extends TriggeredAbilityImpl {
 
     public NirkanaRevenantTriggeredAbility() {
     super(Zone.BATTLEFIELD, new NirkanaRevenantEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java
index c7068b13dfe..020bc3068b0 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/PawnOfUlamog.java
@@ -73,7 +73,7 @@ public class PawnOfUlamog extends CardImpl<PawnOfUlamog> {
     }
 }
 
-class PawnOfUlamogTriggeredAbility extends TriggeredAbilityImpl<PawnOfUlamogTriggeredAbility> {
+class PawnOfUlamogTriggeredAbility extends TriggeredAbilityImpl {
 
     public PawnOfUlamogTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new EldraziSpawnToken()), true);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java
index a20e42f910f..c091edff406 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RaidBombardment.java
@@ -66,7 +66,7 @@ public class RaidBombardment extends CardImpl<RaidBombardment> {
     }
 }
 
-class RaidBombardmentTriggeredAbility extends TriggeredAbilityImpl<RaidBombardmentTriggeredAbility> {
+class RaidBombardmentTriggeredAbility extends TriggeredAbilityImpl {
 
     public RaidBombardmentTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java
index c971ccb49c6..7764bfbbd77 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RapaciousOne.java
@@ -72,7 +72,7 @@ public class RapaciousOne extends CardImpl<RapaciousOne> {
     }
 }
 
-class RapaciousOneTriggeredAbility extends TriggeredAbilityImpl<RapaciousOneTriggeredAbility> {
+class RapaciousOneTriggeredAbility extends TriggeredAbilityImpl {
 
     public RapaciousOneTriggeredAbility() {
         super(Zone.BATTLEFIELD, null, false);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
index dd13ed94cf8..0ad78b96a47 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/RenegadeDoppelganger.java
@@ -75,7 +75,7 @@ public class RenegadeDoppelganger extends CardImpl<RenegadeDoppelganger> {
     }
 }
 
-class RenegadeDoppelgangerTriggeredAbility extends TriggeredAbilityImpl<RenegadeDoppelgangerTriggeredAbility> {
+class RenegadeDoppelgangerTriggeredAbility extends TriggeredAbilityImpl {
 
     RenegadeDoppelgangerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RenegadeDoppelgangerEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java
index 4ae670ec9aa..7dc518aafd1 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/UlamogTheInfiniteGyre.java
@@ -85,7 +85,7 @@ public class UlamogTheInfiniteGyre extends CardImpl<UlamogTheInfiniteGyre> {
     }
 }
 
-class UlamogTheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl<UlamogTheInfiniteGyreDestroyOnCastAbility> {
+class UlamogTheInfiniteGyreDestroyOnCastAbility extends TriggeredAbilityImpl {
 
     UlamogTheInfiniteGyreDestroyOnCastAbility ( ) {
         super(Zone.STACK, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
index c93e523170b..2f3f69ea4c7 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
@@ -74,7 +74,7 @@ public class Vengevine extends CardImpl<Vengevine> {
 
 }
 
-class VengevineAbility extends TriggeredAbilityImpl<VengevineAbility> {
+class VengevineAbility extends TriggeredAbilityImpl {
 
     public VengevineAbility() {
         super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java
index 21323eb6ac6..dd38b68c96f 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/WorldAtWar.java
@@ -107,7 +107,7 @@ class WorldAtWarEffect extends OneShotEffect<WorldAtWarEffect> {
 
 }
 
-class UntapDelayedTriggeredAbility extends DelayedTriggeredAbility<UntapDelayedTriggeredAbility> {
+class UntapDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID connectedTurnMod;
     private boolean enabled;
diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java
index 8147c3b42ee..89c5c9aef3c 100644
--- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java
+++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/ZulaportEnforcer.java
@@ -86,7 +86,7 @@ public class ZulaportEnforcer extends LevelerCard<ZulaportEnforcer> {
     }
 }
 
-class ZulaportEnforcerAbility extends EvasionAbility<ZulaportEnforcerAbility> {
+class ZulaportEnforcerAbility extends EvasionAbility {
 
     private static ZulaportEnforcerAbility instance;
 
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java
index 672d14c24a0..291a9dae2b3 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/MichikoKondaTruthSeeker.java
@@ -73,7 +73,7 @@ public class MichikoKondaTruthSeeker extends CardImpl<MichikoKondaTruthSeeker> {
     }
 }
 
-class MichikoKondaTruthSeekerAbility extends TriggeredAbilityImpl<MichikoKondaTruthSeekerAbility> {
+class MichikoKondaTruthSeekerAbility extends TriggeredAbilityImpl {
 
     public MichikoKondaTruthSeekerAbility() {
         super(Zone.BATTLEFIELD, new SacrificeEffect(new FilterPermanent(), 1, "that player"), false);
diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java
index c32d485813e..fe29e43935a 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/RuneTailKitsuneAscendant.java
@@ -78,7 +78,7 @@ public class RuneTailKitsuneAscendant extends CardImpl<RuneTailKitsuneAscendant>
     }
 }
 
-class RuneTailKitsuneAscendantFlipAbility extends StateTriggeredAbility<RuneTailKitsuneAscendantFlipAbility> {
+class RuneTailKitsuneAscendantFlipAbility extends StateTriggeredAbility {
 
     public RuneTailKitsuneAscendantFlipAbility() {
         super(Zone.BATTLEFIELD, new FlipSourceEffect(new RuneTailEssence()));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java
index 81038431084..0469e19ab5a 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/CopperhornScout.java
@@ -73,7 +73,7 @@ public class CopperhornScout extends CardImpl<CopperhornScout> {
     }
 }
 
-class CopperhornScoutTriggeredAbility extends TriggeredAbilityImpl<CopperhornScoutTriggeredAbility> {
+class CopperhornScoutTriggeredAbility extends TriggeredAbilityImpl {
 
     public CopperhornScoutTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CopperhornScoutUntapEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java
index d00ceabced7..03b4a8aa732 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/DissipationField.java
@@ -65,7 +65,7 @@ public class DissipationField extends CardImpl<DissipationField> {
     }
 }
 
-class DissipationFieldAbility extends TriggeredAbilityImpl<DissipationFieldAbility> {
+class DissipationFieldAbility extends TriggeredAbilityImpl {
 
     public DissipationFieldAbility() {
         super(Zone.BATTLEFIELD, new ReturnToHandTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java
index 740478a954b..1efafe5fd9b 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/EzurisArchers.java
@@ -74,7 +74,7 @@ public class EzurisArchers extends CardImpl<EzurisArchers> {
     }
 }
 
-class BlocksCreatureWithFlyingTriggeredAbility extends TriggeredAbilityImpl<BlocksCreatureWithFlyingTriggeredAbility> {
+class BlocksCreatureWithFlyingTriggeredAbility extends TriggeredAbilityImpl {
 
     public BlocksCreatureWithFlyingTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java
index 0177f45e27b..f7c14d2a6ae 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/FurnaceCelebration.java
@@ -64,7 +64,7 @@ public class FurnaceCelebration extends CardImpl<FurnaceCelebration> {
 
 }
 
-class FurnaceCelebrationAbility extends TriggeredAbilityImpl<FurnaceCelebrationAbility> {
+class FurnaceCelebrationAbility extends TriggeredAbilityImpl {
 
     public FurnaceCelebrationAbility() {
         super(Zone.BATTLEFIELD, new DoIfCostPaid(new DamageTargetEffect(2), new ManaCostsImpl("{2}")));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java
index 0ad9dbcd227..1b8cee4b500 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/GolemsHeart.java
@@ -62,7 +62,7 @@ public class GolemsHeart extends CardImpl<GolemsHeart> {
 
 }
 
-class GolemsHeartAbility extends TriggeredAbilityImpl<GolemsHeartAbility> {
+class GolemsHeartAbility extends TriggeredAbilityImpl {
 
     public GolemsHeartAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java
index f1b7bfca72e..b9d858590a0 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/InfiltrationLens.java
@@ -70,7 +70,7 @@ public class InfiltrationLens extends CardImpl<InfiltrationLens> {
     }
 }
 
-class EquippedBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl<EquippedBecomesBlockedTriggeredAbility> {
+class EquippedBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
 
     public EquippedBecomesBlockedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java
index 2db641b3c04..065b222f0ac 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LiegeOfTheTangle.java
@@ -81,7 +81,7 @@ public class LiegeOfTheTangle extends CardImpl<LiegeOfTheTangle> {
     }
 }
 
-class LiegeOfTheTangleTriggeredAbility extends TriggeredAbilityImpl<LiegeOfTheTangleTriggeredAbility> {
+class LiegeOfTheTangleTriggeredAbility extends TriggeredAbilityImpl {
     LiegeOfTheTangleTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersTargetEffect(CounterType.AWAKENING.createInstance()));
         this.addEffect(new LiegeOfTheTangleEffect());
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
index d1d3247167e..5fcde390fba 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/LivewireLash.java
@@ -75,7 +75,7 @@ public class LivewireLash extends CardImpl<LivewireLash> {
     }
 }
 
-class LivewireLashAbility extends TriggeredAbilityImpl<LivewireLashAbility> {
+class LivewireLashAbility extends TriggeredAbilityImpl {
 
     public LivewireLashAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java
index 57a5ef745a8..f5022a838f8 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MimicVat.java
@@ -82,7 +82,7 @@ public class MimicVat extends CardImpl<MimicVat> {
     }
 }
 
-class MimicVatTriggeredAbility extends TriggeredAbilityImpl<MimicVatTriggeredAbility> {
+class MimicVatTriggeredAbility extends TriggeredAbilityImpl {
 
     MimicVatTriggeredAbility() {
         super(Zone.BATTLEFIELD, new MimicVatEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java
index a8058e33753..006de59b18e 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MolderBeast.java
@@ -72,7 +72,7 @@ public class MolderBeast extends CardImpl<MolderBeast> {
     }
 }
 
-class MolderBeastTriggeredAbility extends TriggeredAbilityImpl<MolderBeastTriggeredAbility> {
+class MolderBeastTriggeredAbility extends TriggeredAbilityImpl {
 
     public MolderBeastTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java
index d4a58f08c61..1644befdd41 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenTailMasticore.java
@@ -85,7 +85,7 @@ public class MoltenTailMasticore extends CardImpl<MoltenTailMasticore> {
 
 }
 
-class MoltenTailMasticoreAbility extends TriggeredAbilityImpl<MoltenTailMasticoreAbility> {
+class MoltenTailMasticoreAbility extends TriggeredAbilityImpl {
     public MoltenTailMasticoreAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceUnlessPaysEffect(new DiscardTargetCost(new TargetCardInHand())));
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java
index 2823cb723d4..b93afd74bd8 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NecroticOoze.java
@@ -74,7 +74,7 @@ public class NecroticOoze extends CardImpl<NecroticOoze> {
 
 }
 
-class NecroticOozeAbility extends StaticAbility<NecroticOozeAbility> {
+class NecroticOozeAbility extends StaticAbility {
 
     public NecroticOozeAbility() {
         super(Zone.BATTLEFIELD, new NecroticOozeEffect());
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java
index c397b68cc63..8ca0641870b 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/NimDeathmantle.java
@@ -86,7 +86,7 @@ public class NimDeathmantle extends CardImpl<NimDeathmantle> {
     }
 }
 
-class NimDeathmantleTriggeredAbility extends TriggeredAbilityImpl<NimDeathmantleTriggeredAbility> {
+class NimDeathmantleTriggeredAbility extends TriggeredAbilityImpl {
 
     NimDeathmantleTriggeredAbility() {
         super(Zone.BATTLEFIELD, new NimDeathmantleEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java
index 653eb431de4..6589faf70f5 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/OgreGeargrabber.java
@@ -126,7 +126,7 @@ class OgreGeargrabberEffect1 extends OneShotEffect<OgreGeargrabberEffect1> {
 
 }
 
-class OgreGeargrabberDelayedTriggeredAbility extends DelayedTriggeredAbility<OgreGeargrabberDelayedTriggeredAbility> {
+class OgreGeargrabberDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID equipmentId;
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java
index d4d3d0b9dd3..6222cada8d3 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java
@@ -69,7 +69,7 @@ public class PainfulQuandary extends CardImpl<PainfulQuandary> {
 
 }
 
-class PainfulQuandryAbility extends TriggeredAbilityImpl<PainfulQuandryAbility> {
+class PainfulQuandryAbility extends TriggeredAbilityImpl {
 
     public PainfulQuandryAbility() {
         super(Zone.BATTLEFIELD, new PainfulQuandryEffect());
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java
index 822ca636578..98848b39964 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PrecursorGolem.java
@@ -84,7 +84,7 @@ public class PrecursorGolem extends CardImpl<PrecursorGolem> {
     }
 }
 
-class PrecursorGolemCopyTriggeredAbility extends TriggeredAbilityImpl<PrecursorGolemCopyTriggeredAbility> {
+class PrecursorGolemCopyTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell filter = new FilterSpell();
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java
index 5de36b017c1..929223127c4 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/RelicPutrescence.java
@@ -78,7 +78,7 @@ public class RelicPutrescence extends CardImpl<RelicPutrescence> {
 
 }
 
-class RelicPutrescenceAbility extends TriggeredAbilityImpl<RelicPutrescenceAbility> {
+class RelicPutrescenceAbility extends TriggeredAbilityImpl {
 
     public RelicPutrescenceAbility() {
         super(Zone.BATTLEFIELD, new AddCountersControllerEffect(CounterType.POISON.createInstance(), true));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java
index 5594c67535b..82a4466dda3 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/SwordOfBodyAndMind.java
@@ -92,7 +92,7 @@ public class SwordOfBodyAndMind extends CardImpl<SwordOfBodyAndMind> {
     }
 }
 
-class SwordOfBodyAndMindAbility extends TriggeredAbilityImpl<SwordOfBodyAndMindAbility> {
+class SwordOfBodyAndMindAbility extends TriggeredAbilityImpl {
 
     public SwordOfBodyAndMindAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new WolfToken()));
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
index 47dc8de872f..dee1d747604 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/TunnelIgnus.java
@@ -116,7 +116,7 @@ class TunnelIgnusWatcher extends Watcher {
     }
 }
 
-class TunnelIgnusTriggeredAbility extends TriggeredAbilityImpl<TunnelIgnusTriggeredAbility> {
+class TunnelIgnusTriggeredAbility extends TriggeredAbilityImpl {
     TunnelIgnusTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(3));
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java
index 8ab963c05bb..6f8e164b378 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VenserTheSojourner.java
@@ -153,7 +153,7 @@ class VenserTheSojournerEmblem extends Emblem {
     }
 }
 
-class VenserTheSojournerSpellCastTriggeredAbility extends TriggeredAbilityImpl<VenserTheSojournerSpellCastTriggeredAbility> {
+class VenserTheSojournerSpellCastTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell spellCard = new FilterSpell("a spell");
     protected FilterSpell filter;
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
index 56f975d8f2d..28ebbd55115 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/VigilForTheLost.java
@@ -69,7 +69,7 @@ public class VigilForTheLost extends CardImpl<VigilForTheLost> {
 
 }
 
-class VigilForTheLostTriggeredAbility extends TriggeredAbilityImpl<VigilForTheLostTriggeredAbility> {
+class VigilForTheLostTriggeredAbility extends TriggeredAbilityImpl {
     VigilForTheLostTriggeredAbility() {
         super(Zone.BATTLEFIELD, new VigilForTheLostEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
index 9faca381c2a..1c28d276a10 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/ViridianRevel.java
@@ -64,7 +64,7 @@ public class ViridianRevel extends CardImpl<ViridianRevel> {
     }
 }
 
-class ViridianRevelTriggeredAbility extends TriggeredAbilityImpl<ViridianRevelTriggeredAbility> {
+class ViridianRevelTriggeredAbility extends TriggeredAbilityImpl {
     ViridianRevelTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
     }
diff --git a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
index c109e1ea05c..e5871c301f8 100644
--- a/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
+++ b/Mage.Sets/src/mage/sets/scourge/XantidSwarm.java
@@ -78,7 +78,7 @@ public class XantidSwarm extends CardImpl<XantidSwarm> {
     }
 }
 
-class XantidSwarmTriggeredAbility extends TriggeredAbilityImpl<XantidSwarmTriggeredAbility> {
+class XantidSwarmTriggeredAbility extends TriggeredAbilityImpl {
 
     public XantidSwarmTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java b/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java
index 54061c7438e..e7f78078746 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/AEtherFlash.java
@@ -67,7 +67,7 @@ public class AEtherFlash extends CardImpl<AEtherFlash> {
     }
 }
 
-class AEtherFlashTriggeredAbility extends TriggeredAbilityImpl<AEtherFlashTriggeredAbility> {
+class AEtherFlashTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java b/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java
index 598e412413b..f0c06052ea5 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/FinalFortune.java
@@ -100,7 +100,7 @@ class FinalFortuneEffect extends OneShotEffect<FinalFortuneEffect> {
     
 }
 
-class FinalFortuneLoseDelayedTriggeredAbility extends DelayedTriggeredAbility<FinalFortuneLoseDelayedTriggeredAbility> {
+class FinalFortuneLoseDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID connectedTurnMod;
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java
index a558733c237..4de43602a0a 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/RelentlessAssault.java
@@ -140,7 +140,7 @@ class RelentlessAssaultAddPhasesEffect extends OneShotEffect<RelentlessAssaultAd
     }
 }
 
-class RelentlessAssaultDelayedAddMainPhaseAbility extends DelayedTriggeredAbility<RelentlessAssaultDelayedAddMainPhaseAbility> {
+class RelentlessAssaultDelayedAddMainPhaseAbility extends DelayedTriggeredAbility {
 
     private UUID connectedTurnMod;
     private boolean enabled;
diff --git a/Mage.Sets/src/mage/sets/seventhedition/Rowen.java b/Mage.Sets/src/mage/sets/seventhedition/Rowen.java
index e2cf646fece..147f6da19c1 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/Rowen.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/Rowen.java
@@ -68,7 +68,7 @@ public class Rowen extends CardImpl<Rowen> {
     }
 }
 
-class RowenAbility extends TriggeredAbilityImpl<RowenAbility> {
+class RowenAbility extends TriggeredAbilityImpl {
 
     private int lastTriggeredTurn;
 
diff --git a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java
index d70c1f46290..8803817de2f 100644
--- a/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java
+++ b/Mage.Sets/src/mage/sets/seventhedition/SpiritLink.java
@@ -80,7 +80,7 @@ public class SpiritLink extends CardImpl<SpiritLink> {
     }
 }
 
-class SpiritLinkTriggeredAbility extends TriggeredAbilityImpl<SpiritLinkTriggeredAbility> {
+class SpiritLinkTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpiritLinkTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SpiritLinkEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java b/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java
index 4f24697e34f..f3132694092 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/DemigodOfRevenge.java
@@ -81,7 +81,7 @@ public class DemigodOfRevenge extends CardImpl<DemigodOfRevenge> {
     }
 }
 
-class DemigodOfRevengeTriggeredAbility extends TriggeredAbilityImpl<DemigodOfRevengeTriggeredAbility> {
+class DemigodOfRevengeTriggeredAbility extends TriggeredAbilityImpl {
 
     public DemigodOfRevengeTriggeredAbility() {
         super(Zone.STACK, new DemigodOfRevengeReturnEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java b/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java
index 66567bd0ecb..b679bdc0264 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java
@@ -113,7 +113,7 @@ class LureboundScarecrowChooseColorEffect extends OneShotEffect<LureboundScarecr
     
 }
 
-class LureboundScarecrowTriggeredAbility extends StateTriggeredAbility<LureboundScarecrowTriggeredAbility> {
+class LureboundScarecrowTriggeredAbility extends StateTriggeredAbility {
     
     private static final String staticText = "When you control no permanents of the chosen color, sacrifice {this}.";
 
diff --git a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java
index 5d02013bbe7..80501e9d0dd 100644
--- a/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java
+++ b/Mage.Sets/src/mage/sets/shadowmoor/SpitefulVisions.java
@@ -75,7 +75,7 @@ public class SpitefulVisions extends CardImpl<SpitefulVisions> {
     }
 }
 
-class SpitefulVisionsTriggeredAbility  extends TriggeredAbilityImpl<SpitefulVisionsTriggeredAbility> {
+class SpitefulVisionsTriggeredAbility  extends TriggeredAbilityImpl {
 
     public SpitefulVisionsTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java
index 80f77a57969..446a0bbff89 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/AngelicBenediction.java
@@ -67,7 +67,7 @@ public class AngelicBenediction extends CardImpl<AngelicBenediction> {
     }
 }
 
-class AngelicBenedictionTriggeredAbility extends TriggeredAbilityImpl<AngelicBenedictionTriggeredAbility> {
+class AngelicBenedictionTriggeredAbility extends TriggeredAbilityImpl {
 
     public AngelicBenedictionTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TapTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java
index 59a0c6bf4fb..ddc608b0788 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/BattlegraceAngel.java
@@ -81,7 +81,7 @@ public class BattlegraceAngel extends CardImpl<BattlegraceAngel> {
 
 }
 
-class BattlegraceAngelAbility extends TriggeredAbilityImpl<BattlegraceAngelAbility> {
+class BattlegraceAngelAbility extends TriggeredAbilityImpl {
 
     public BattlegraceAngelAbility() {
         super(Zone.BATTLEFIELD, new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java
index e3f141411ac..f50b28926b5 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/CradleOfVitality.java
@@ -73,7 +73,7 @@ public class CradleOfVitality extends CardImpl<CradleOfVitality> {
 }
 
 
-class CradleOfVitalityGainLifeTriggeredAbility extends TriggeredAbilityImpl<CradleOfVitalityGainLifeTriggeredAbility> {
+class CradleOfVitalityGainLifeTriggeredAbility extends TriggeredAbilityImpl {
 
     public CradleOfVitalityGainLifeTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CradleOfVitalityEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java
index 9ceb19fe5c7..89dd83805fb 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Drumhunter.java
@@ -75,7 +75,7 @@ public class Drumhunter extends CardImpl<Drumhunter> {
     }
 }
 
-class DrumHunterTriggeredAbility extends TriggeredAbilityImpl<DrumHunterTriggeredAbility> {
+class DrumHunterTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater");
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java
index 407ffdc3d7f..765a50f1a36 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/ExuberantFirestoker.java
@@ -76,7 +76,7 @@ public class ExuberantFirestoker extends CardImpl<ExuberantFirestoker> {
     }
 }
 
-class ExuberantFirestokerTriggeredAbility extends TriggeredAbilityImpl<ExuberantFirestokerTriggeredAbility> {
+class ExuberantFirestokerTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater");
 
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java
index 1e7bf7275a4..4f50450bda7 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/ImmortalCoil.java
@@ -80,7 +80,7 @@ public class ImmortalCoil extends CardImpl<ImmortalCoil> {
     }
 }
 
-class ImmortalCoilAbility extends StateTriggeredAbility<ImmortalCoilAbility> {
+class ImmortalCoilAbility extends StateTriggeredAbility {
 
     public ImmortalCoilAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java
index 9d7bf271f11..da714263846 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Manaplasm.java
@@ -74,7 +74,7 @@ public class Manaplasm extends CardImpl<Manaplasm> {
 }
 
 
-class ManaplasmAbility extends TriggeredAbilityImpl<ManaplasmAbility> {
+class ManaplasmAbility extends TriggeredAbilityImpl {
 
     public ManaplasmAbility() {
         super(Zone.BATTLEFIELD, new EmptyEffect("{this} gets +X/+X until end of turn, where X is that spell's converted mana cost"), false);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java
index 3dbb42ab1e1..9247081067b 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/MemoryErosion.java
@@ -67,7 +67,7 @@ public class MemoryErosion extends CardImpl<MemoryErosion> {
 }
 
 
-class SpellCastTriggeredAbility extends TriggeredAbilityImpl<SpellCastTriggeredAbility> {
+class SpellCastTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpellCastTriggeredAbility() {
         super(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), false);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java
index 63e3a6f639b..35b179f1c66 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/MightyEmergence.java
@@ -75,7 +75,7 @@ public class MightyEmergence extends CardImpl<MightyEmergence> {
 }
 
 
-class MightyEmergenceTriggeredAbility extends TriggeredAbilityImpl<MightyEmergenceTriggeredAbility> {
+class MightyEmergenceTriggeredAbility extends TriggeredAbilityImpl {
     private static final FilterCreatureCard filter = new FilterCreatureCard("creature with power 5 or greater");
     static {
         filter.add(new PowerPredicate(Filter.ComparisonType.GreaterThan, 4));
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java
index c414062db8a..9356d038f28 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/PrinceOfThralls.java
@@ -79,7 +79,7 @@ public class PrinceOfThralls extends CardImpl<PrinceOfThralls> {
     }
 }
 
-class PrinceOfThrallsTriggeredAbility extends TriggeredAbilityImpl<PrinceOfThrallsTriggeredAbility> {
+class PrinceOfThrallsTriggeredAbility extends TriggeredAbilityImpl {
 
     PrinceOfThrallsTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java
index 751151f18b1..63e584f43f5 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/QasaliAmbusher.java
@@ -82,7 +82,7 @@ public class QasaliAmbusher extends CardImpl<QasaliAmbusher> {
     }
 }
 
-class QasaliAmbusherAbility extends ActivatedAbilityImpl<QasaliAmbusherAbility> {
+class QasaliAmbusherAbility extends ActivatedAbilityImpl {
 
     private static final FilterControlledLandPermanent filterPlains = new FilterControlledLandPermanent();
     private static final FilterControlledLandPermanent filterForest = new FilterControlledLandPermanent();
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java b/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java
index 19be25048ba..2e38dc5a008 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/QuietusSpike.java
@@ -79,7 +79,7 @@ public class QuietusSpike extends CardImpl<QuietusSpike> {
     }
 }
 
-class QuietusSpikeTriggeredAbility extends TriggeredAbilityImpl<QuietusSpikeTriggeredAbility> {
+class QuietusSpikeTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuietusSpikeTriggeredAbility() {
         super(Zone.BATTLEFIELD, new QuietusSpikeEffect());
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java
index 02b4cf1e267..ef729cafc80 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java
@@ -81,7 +81,7 @@ public class RafiqOfTheMany extends CardImpl<RafiqOfTheMany> {
 
 }
 
-class RafiqOfTheManyAbility extends TriggeredAbilityImpl<RafiqOfTheManyAbility> {
+class RafiqOfTheManyAbility extends TriggeredAbilityImpl {
 
     public RafiqOfTheManyAbility() {
         super(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn));
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java b/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java
index 4c1419c8baa..fc776c1e4ba 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/ShardingSphinx.java
@@ -76,7 +76,7 @@ public class ShardingSphinx extends CardImpl<ShardingSphinx> {
     }
 }
 
-class ShardingSphinxTriggeredAbility extends TriggeredAbilityImpl<ShardingSphinxTriggeredAbility> {
+class ShardingSphinxTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("artifact creature you control");
     static{
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java
index d6866a7a86a..3d904bdcb06 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/Skeletonize.java
@@ -107,7 +107,7 @@ class SkeletonizeEffect extends OneShotEffect<SkeletonizeEffect> {
     }
 }
 
-class SkeletonizeDelayedTriggeredAbility extends DelayedTriggeredAbility<SkeletonizeDelayedTriggeredAbility> {
+class SkeletonizeDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public SkeletonizeDelayedTriggeredAbility() {
         super(new CreateTokenEffect(new SkeletonToken()), Duration.EndOfTurn);
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java
index e995df291ab..ca9fd68bd50 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/SkillBorrower.java
@@ -82,7 +82,7 @@ public class SkillBorrower extends CardImpl<SkillBorrower> {
 }
 
 
-class SkillBorrowerAbility extends StaticAbility<SkillBorrowerAbility> {
+class SkillBorrowerAbility extends StaticAbility {
 
     public SkillBorrowerAbility() {
         super(Zone.BATTLEFIELD, new SkillBorrowerEffect());
diff --git a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java
index 26e99db3ffb..cf8f80b767f 100644
--- a/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java
+++ b/Mage.Sets/src/mage/sets/shardsofalara/SunseedNurturer.java
@@ -75,7 +75,7 @@ public class SunseedNurturer extends CardImpl<SunseedNurturer> {
     }
 }
 
-class SunseedNurturerTriggeredAbility extends TriggeredAbilityImpl<SunseedNurturerTriggeredAbility> {
+class SunseedNurturerTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater");
 
diff --git a/Mage.Sets/src/mage/sets/stronghold/HornOfGreed.java b/Mage.Sets/src/mage/sets/stronghold/HornOfGreed.java
index 7e50b343ee4..d6ecda98d75 100644
--- a/Mage.Sets/src/mage/sets/stronghold/HornOfGreed.java
+++ b/Mage.Sets/src/mage/sets/stronghold/HornOfGreed.java
@@ -62,7 +62,7 @@ public class HornOfGreed extends CardImpl<HornOfGreed> {
     }
 }
 
-class HornOfGreedAbility extends TriggeredAbilityImpl<HornOfGreedAbility> {
+class HornOfGreedAbility extends TriggeredAbilityImpl {
 
     public HornOfGreedAbility() {
         super(Zone.BATTLEFIELD, new DrawCardTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java
index ac5c9c09264..6bf923e954d 100644
--- a/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java
+++ b/Mage.Sets/src/mage/sets/tempest/DeathPitsOfRath.java
@@ -66,7 +66,7 @@ public class DeathPitsOfRath extends CardImpl<DeathPitsOfRath> {
     }
 }
 
-class DeathPitsOfRathTriggeredAbility extends TriggeredAbilityImpl<DeathPitsOfRathTriggeredAbility> {
+class DeathPitsOfRathTriggeredAbility extends TriggeredAbilityImpl {
 
     public DeathPitsOfRathTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(true));
diff --git a/Mage.Sets/src/mage/sets/tempest/JackalPup.java b/Mage.Sets/src/mage/sets/tempest/JackalPup.java
index 0888b076e52..616cce1af8f 100644
--- a/Mage.Sets/src/mage/sets/tempest/JackalPup.java
+++ b/Mage.Sets/src/mage/sets/tempest/JackalPup.java
@@ -73,7 +73,7 @@ public class JackalPup extends CardImpl<JackalPup> {
     }
 }
 
-class JackalPupTriggeredAbility extends TriggeredAbilityImpl<JackalPupTriggeredAbility> {
+class JackalPupTriggeredAbility extends TriggeredAbilityImpl {
 
     public JackalPupTriggeredAbility() {
         super(Zone.BATTLEFIELD, new JackalPupEffect());
diff --git a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java
index fd5771b0c28..d539417b2c5 100644
--- a/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java
+++ b/Mage.Sets/src/mage/sets/tenth/AngelsFeather.java
@@ -63,7 +63,7 @@ public class AngelsFeather extends CardImpl<AngelsFeather> {
 
 }
 
-class AngelsFeatherAbility extends TriggeredAbilityImpl<AngelsFeatherAbility> {
+class AngelsFeatherAbility extends TriggeredAbilityImpl {
 
     public AngelsFeatherAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java
index 79cf8067003..3d2ef5c8e63 100644
--- a/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java
+++ b/Mage.Sets/src/mage/sets/tenth/DemonsHorn.java
@@ -63,7 +63,7 @@ public class DemonsHorn extends CardImpl<DemonsHorn> {
 
 }
 
-class DemonsHornAbility extends TriggeredAbilityImpl<DemonsHornAbility> {
+class DemonsHornAbility extends TriggeredAbilityImpl {
 
     public DemonsHornAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java
index eb172c0b4ad..2722c50f1d7 100644
--- a/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java
+++ b/Mage.Sets/src/mage/sets/tenth/DragonsClaw.java
@@ -63,7 +63,7 @@ public class DragonsClaw extends CardImpl<DragonsClaw> {
 
 }
 
-class DragonsClawAbility extends TriggeredAbilityImpl<DragonsClawAbility> {
+class DragonsClawAbility extends TriggeredAbilityImpl {
 
     public DragonsClawAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java
index dbbc1017c1d..1b330534328 100644
--- a/Mage.Sets/src/mage/sets/tenth/KrakensEye.java
+++ b/Mage.Sets/src/mage/sets/tenth/KrakensEye.java
@@ -63,7 +63,7 @@ public class KrakensEye extends CardImpl<KrakensEye> {
 
 }
 
-class KrakensEyeAbility extends TriggeredAbilityImpl<KrakensEyeAbility> {
+class KrakensEyeAbility extends TriggeredAbilityImpl {
 
     public KrakensEyeAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
index 1dedd5e8eaa..cd132be0130 100644
--- a/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
+++ b/Mage.Sets/src/mage/sets/tenth/Manabarbs.java
@@ -67,7 +67,7 @@ public class Manabarbs extends CardImpl<Manabarbs> {
     }
 }
 
-class ManabarbsTriggeredAbility extends TriggeredAbilityImpl<ManabarbsTriggeredAbility> {
+class ManabarbsTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final String staticText = "Whenever a player taps a land for mana, Manabarbs deals 1 damage to that player.";
 
diff --git a/Mage.Sets/src/mage/sets/tenth/Megrim.java b/Mage.Sets/src/mage/sets/tenth/Megrim.java
index 0af5c1285b4..258f77793cb 100644
--- a/Mage.Sets/src/mage/sets/tenth/Megrim.java
+++ b/Mage.Sets/src/mage/sets/tenth/Megrim.java
@@ -64,7 +64,7 @@ public class Megrim extends CardImpl<Megrim> {
 
 }
 
-class MergimTriggeredAbility extends TriggeredAbilityImpl<MergimTriggeredAbility> {
+class MergimTriggeredAbility extends TriggeredAbilityImpl {
     MergimTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
         this.addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java
index de307dd7fc7..947592f6c43 100644
--- a/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java
+++ b/Mage.Sets/src/mage/sets/tenth/TerramorphicExpanse.java
@@ -64,7 +64,7 @@ public class TerramorphicExpanse extends CardImpl<TerramorphicExpanse> {
 
 }
 
-class TerramorphicExpanseAbility extends ActivatedAbilityImpl<TerramorphicExpanseAbility> {
+class TerramorphicExpanseAbility extends ActivatedAbilityImpl {
 
     public TerramorphicExpanseAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java b/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java
index a4b40ada158..810e8f3a96f 100644
--- a/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java
+++ b/Mage.Sets/src/mage/sets/tenth/WurmsTooth.java
@@ -63,7 +63,7 @@ public class WurmsTooth extends CardImpl<WurmsTooth> {
 
 }
 
-class WurmsToothAbility extends TriggeredAbilityImpl<WurmsToothAbility> {
+class WurmsToothAbility extends TriggeredAbilityImpl {
 
     public WurmsToothAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/thedark/Venom.java b/Mage.Sets/src/mage/sets/thedark/Venom.java
index 9d1f088795f..5bb8938e25d 100644
--- a/Mage.Sets/src/mage/sets/thedark/Venom.java
+++ b/Mage.Sets/src/mage/sets/thedark/Venom.java
@@ -79,7 +79,7 @@ public class Venom extends CardImpl<Venom> {
     }
 }
 
-class VenomTriggeredAbility extends TriggeredAbilityImpl<VenomTriggeredAbility> {
+class VenomTriggeredAbility extends TriggeredAbilityImpl {
 
     VenomTriggeredAbility() {
         super(Zone.BATTLEFIELD, new VenomEffect());
diff --git a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java
index 0f2359dcbe3..aa795673673 100644
--- a/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java
+++ b/Mage.Sets/src/mage/sets/theros/BidentOfThassa.java
@@ -77,7 +77,7 @@ public class BidentOfThassa extends CardImpl<BidentOfThassa> {
     }
 }
 
-class BidentOfThassaTriggeredAbility extends TriggeredAbilityImpl<BidentOfThassaTriggeredAbility> {
+class BidentOfThassaTriggeredAbility extends TriggeredAbilityImpl {
 
     public BidentOfThassaTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
index b98dd73e629..66c9ba5e101 100644
--- a/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
+++ b/Mage.Sets/src/mage/sets/theros/ChainedToTheRocks.java
@@ -164,7 +164,7 @@ class ChainedToTheRocksEffect extends OneShotEffect<ChainedToTheRocksEffect> {
  * @author LevelX2
  */
 
-class ChainedToTheRocksReturnExiledAbility extends TriggeredAbilityImpl<ChainedToTheRocksReturnExiledAbility> {
+class ChainedToTheRocksReturnExiledAbility extends TriggeredAbilityImpl {
 
     public ChainedToTheRocksReturnExiledAbility() {
         super(Zone.BATTLEFIELD, new ReturnExiledCreatureChainedToTheRocksEffect());
diff --git a/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java b/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java
index 6b69d89fa81..23e6e5603e5 100644
--- a/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java
+++ b/Mage.Sets/src/mage/sets/theros/FlamespeakerAdept.java
@@ -71,7 +71,7 @@ public class FlamespeakerAdept extends CardImpl<FlamespeakerAdept> {
         return new FlamespeakerAdept(this);
     }
 }
-class ScryTriggeredAbility extends TriggeredAbilityImpl<ScryTriggeredAbility> {
+class ScryTriggeredAbility extends TriggeredAbilityImpl {
 
     public ScryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BoostSourceEffect(2,0, Duration.EndOfTurn), false);
diff --git a/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java b/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java
index 9139020fe95..22ab49ff60a 100644
--- a/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java
+++ b/Mage.Sets/src/mage/sets/theros/RescueFromTheUnderworld.java
@@ -177,7 +177,7 @@ class RescueFromTheUnderworldCreateDelayedTriggeredAbilityEffect extends OneShot
 
 }
 
-class RescueFromTheUnderworldDelayedTriggeredAbility extends DelayedTriggeredAbility<RescueFromTheUnderworldDelayedTriggeredAbility> {
+class RescueFromTheUnderworldDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public RescueFromTheUnderworldDelayedTriggeredAbility() {
         this(new RescueFromTheUnderworldReturnEffect(), TargetController.YOU);
diff --git a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java
index 988bbf48af5..2a433546e57 100644
--- a/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java
+++ b/Mage.Sets/src/mage/sets/theros/ThassasEmissary.java
@@ -78,7 +78,7 @@ public class ThassasEmissary extends CardImpl<ThassasEmissary> {
     }
 }
 
-class ThassasEmissaryTriggeredAbility extends TriggeredAbilityImpl<ThassasEmissaryTriggeredAbility> {
+class ThassasEmissaryTriggeredAbility extends TriggeredAbilityImpl {
 
     public ThassasEmissaryTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java
index 52d1d565d67..6662f912b4b 100644
--- a/Mage.Sets/src/mage/sets/theros/TimeToFeed.java
+++ b/Mage.Sets/src/mage/sets/theros/TimeToFeed.java
@@ -129,7 +129,7 @@ class TimeToFeedTextEffect extends OneShotEffect<TimeToFeedTextEffect> {
     }
 }
 
-class TimeToFeedDiesTriggeredAbility extends DelayedTriggeredAbility<TimeToFeedDiesTriggeredAbility> {
+class TimeToFeedDiesTriggeredAbility extends DelayedTriggeredAbility {
 
     private UUID watchedCreatureId;
     private int zoneChangeCounter;
diff --git a/Mage.Sets/src/mage/sets/theros/TritonTactics.java b/Mage.Sets/src/mage/sets/theros/TritonTactics.java
index 04d5d82b7a2..9d44bf3f2c2 100644
--- a/Mage.Sets/src/mage/sets/theros/TritonTactics.java
+++ b/Mage.Sets/src/mage/sets/theros/TritonTactics.java
@@ -137,7 +137,7 @@ class TritonTacticsUntapTargetEffect extends OneShotEffect<TritonTacticsUntapTar
 
 }
 
-class TritonTacticsTriggeredAbility extends DelayedTriggeredAbility<TritonTacticsTriggeredAbility> {
+class TritonTacticsTriggeredAbility extends DelayedTriggeredAbility {
 
     public TritonTacticsTriggeredAbility() {
         super(new TritonTacticsEndOfCombatEffect(), Duration.EndOfTurn, true);
diff --git a/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java b/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java
index bf6201e3c37..a4916ef5ad9 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/EssenceSliver.java
@@ -71,7 +71,7 @@ public class EssenceSliver extends CardImpl<EssenceSliver> {
     }
 }
 
-class DealsDamageTriggeredAbility extends TriggeredAbilityImpl<DealsDamageTriggeredAbility> {
+class DealsDamageTriggeredAbility extends TriggeredAbilityImpl {
 
     private final boolean setTargetPointer;
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
index f50ed7e25e5..fde61800acc 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/GrinningTotem.java
@@ -185,7 +185,7 @@ class GrinningTotemMayPlayEffect extends AsThoughEffectImpl<GrinningTotemMayPlay
     
 }
 
-class GrinningTotemDelayedTriggeredAbility extends DelayedTriggeredAbility<GrinningTotemDelayedTriggeredAbility> {
+class GrinningTotemDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public GrinningTotemDelayedTriggeredAbility() {
         super(new GrinningTotemPutIntoGraveyardEffect());
diff --git a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java
index aaf8af613ae..605d8070fee 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/SolkanarTheSwampKing.java
@@ -75,7 +75,7 @@ public class SolkanarTheSwampKing extends CardImpl<SolkanarTheSwampKing> {
     }
 }
 
-class SolkanarTheSwampKingAbility extends TriggeredAbilityImpl<SolkanarTheSwampKingAbility> {
+class SolkanarTheSwampKingAbility extends TriggeredAbilityImpl {
 
     public SolkanarTheSwampKingAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java
index 07eb4f7c4b4..6784393ab7b 100644
--- a/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java
+++ b/Mage.Sets/src/mage/sets/timespiral/AmrouSeekers.java
@@ -78,7 +78,7 @@ public class AmrouSeekers extends CardImpl<AmrouSeekers> {
     }
 }
 
-class AmrouSeekersEvasionAbility extends EvasionAbility<AmrouSeekersEvasionAbility> implements MageSingleton  {
+class AmrouSeekersEvasionAbility extends EvasionAbility implements MageSingleton  {
 
     public AmrouSeekersEvasionAbility() {
         super();
diff --git a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java
index cdf65622ee6..04f1450e9c3 100644
--- a/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java
+++ b/Mage.Sets/src/mage/sets/timespiral/GreaterGargadon.java
@@ -81,7 +81,7 @@ public class GreaterGargadon extends CardImpl<GreaterGargadon> {
 }
 
 
-class GreaterGargadonAbility extends ActivatedAbilityImpl<GreaterGargadonAbility> {
+class GreaterGargadonAbility extends ActivatedAbilityImpl {
    
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("artifact, creature, or land");
     static {
diff --git a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
index 7ae00fbb401..b62cb86dbc1 100644
--- a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
+++ b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java
@@ -76,7 +76,7 @@ public class NorinTheWary extends CardImpl<NorinTheWary> {
     }
 }
 
-class NorinTheWaryTriggeredAbility extends TriggeredAbilityImpl<NorinTheWaryTriggeredAbility> {
+class NorinTheWaryTriggeredAbility extends TriggeredAbilityImpl {
 
     public NorinTheWaryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new NorinTheWaryRemovingEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java
index 7bfecf95429..8b6b85a2142 100644
--- a/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java
+++ b/Mage.Sets/src/mage/sets/timespiral/StuffyDoll.java
@@ -118,7 +118,7 @@ class StuffyDollChoosePlayerEffect extends OneShotEffect<StuffyDollChoosePlayerE
     }
 }
 
-class StuffyDollTriggeredAbility extends TriggeredAbilityImpl<StuffyDollTriggeredAbility> {
+class StuffyDollTriggeredAbility extends TriggeredAbilityImpl {
 
     public StuffyDollTriggeredAbility() {
         super(Zone.BATTLEFIELD, new StuffyDollGainLifeEffect());
diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java
index 2a8ed28859f..22517ccf4b4 100644
--- a/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java
+++ b/Mage.Sets/src/mage/sets/urzasdestiny/AetherSting.java
@@ -64,7 +64,7 @@ public class AetherSting extends CardImpl<AetherSting> {
     }
 }
 
-class AetherStingTriggeredAbility extends TriggeredAbilityImpl<AetherStingTriggeredAbility> {
+class AetherStingTriggeredAbility extends TriggeredAbilityImpl {
 
     public AetherStingTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(1), false);
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java b/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java
index 9c71e2baa9f..5ff6f6739d5 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/MemoryJar.java
@@ -181,7 +181,7 @@ class MemoryJarDelayedEffect extends OneShotEffect<MemoryJarDelayedEffect> {
     
 }
 
-class MemoryJarDelayedTriggeredAbility extends DelayedTriggeredAbility<MemoryJarDelayedTriggeredAbility> {
+class MemoryJarDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public MemoryJarDelayedTriggeredAbility(Effect effect) {
         super(effect);
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java
index 4135be01717..43e38795f05 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/NoMercy.java
@@ -66,7 +66,7 @@ public class NoMercy extends CardImpl<NoMercy> {
         return new NoMercy(this);
     }
     
-    public class NoMercyTriggeredAbility extends TriggeredAbilityImpl<NoMercyTriggeredAbility> {
+    public class NoMercyTriggeredAbility extends TriggeredAbilityImpl {
         public NoMercyTriggeredAbility()
         {
             super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java
index 253804b10b1..81596619585 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Rivalry.java
@@ -69,7 +69,7 @@ public class Rivalry extends CardImpl<Rivalry> {
     }
 }
 
-class RivalryTriggeredAbility extends TriggeredAbilityImpl<RivalryTriggeredAbility> {
+class RivalryTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterLandPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/urzaslegacy/Scrapheap.java b/Mage.Sets/src/mage/sets/urzaslegacy/Scrapheap.java
index 23dc04a5654..1d8fc47ba4a 100644
--- a/Mage.Sets/src/mage/sets/urzaslegacy/Scrapheap.java
+++ b/Mage.Sets/src/mage/sets/urzaslegacy/Scrapheap.java
@@ -66,7 +66,7 @@ public class Scrapheap extends CardImpl<Scrapheap> {
     }
 }
 
-class ScrapheapTriggeredAbility extends TriggeredAbilityImpl<ScrapheapTriggeredAbility> {
+class ScrapheapTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment");
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
index 9d42cade02c..a4590824aa9 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/AngelicChorus.java
@@ -69,7 +69,7 @@ public class AngelicChorus extends CardImpl<AngelicChorus> {
     }
 }
 
-class AngelicChorusTriggeredAbility extends TriggeredAbilityImpl<AngelicChorusTriggeredAbility> {
+class AngelicChorusTriggeredAbility extends TriggeredAbilityImpl {
 
     public AngelicChorusTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AngelicChorusEffect(), false);
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java
index 496e93e19b1..0c541555ba0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Bereavement.java
@@ -65,7 +65,7 @@ public class Bereavement extends CardImpl<Bereavement> {
     }
 }
 
-class BereavementTriggeredAbility extends TriggeredAbilityImpl<BereavementTriggeredAbility> {
+class BereavementTriggeredAbility extends TriggeredAbilityImpl {
 
     public BereavementTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DiscardTargetEffect(1));
diff --git a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java
index 51cda9a0a34..f290cf073f0 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/CarpetOfFlowers.java
@@ -77,7 +77,7 @@ public class CarpetOfFlowers extends CardImpl<CarpetOfFlowers> {
 
 
 
-class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl<CarpetOfFlowersTriggeredAbility> {
+class CarpetOfFlowersTriggeredAbility extends TriggeredAbilityImpl {
 
 
     public CarpetOfFlowersTriggeredAbility() {
diff --git a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
index 96b378720cd..9fea5232dbc 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/EnergyField.java
@@ -115,7 +115,7 @@ class EnergyFieldEffect extends PreventionEffectImpl<EnergyFieldEffect> {
     }
 }
 
-class PutIntoYourGraveyardTriggeredAbility extends TriggeredAbilityImpl<PutIntoYourGraveyardTriggeredAbility> {
+class PutIntoYourGraveyardTriggeredAbility extends TriggeredAbilityImpl {
 
 
 
diff --git a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java
index 44eefeb51f3..35d63648dfc 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/GoblinLackey.java
@@ -74,7 +74,7 @@ public class GoblinLackey extends CardImpl<GoblinLackey> {
     }
 }
 
-class GoblinLackeyTriggeredAbility extends TriggeredAbilityImpl<GoblinLackeyTriggeredAbility> {
+class GoblinLackeyTriggeredAbility extends TriggeredAbilityImpl {
 
     public GoblinLackeyTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GoblinLackeyEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java
index 9762e0292fb..6394754bbc2 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/SpreadingAlgae.java
@@ -94,7 +94,7 @@ public class SpreadingAlgae extends CardImpl<SpreadingAlgae> {
 }
 
 
-class SpreadingAlgaeTriggeredAbility extends TriggeredAbilityImpl<SpreadingAlgaeTriggeredAbility> {
+class SpreadingAlgaeTriggeredAbility extends TriggeredAbilityImpl {
 
     public SpreadingAlgaeTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java b/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java
index 73e767a8573..87882d416e5 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/ThranQuarry.java
@@ -68,7 +68,7 @@ public class ThranQuarry extends CardImpl<ThranQuarry> {
     }
 }
 
-class ThranQuarryTriggeredAbility extends TriggeredAbilityImpl<ThranQuarryTriggeredAbility> {
+class ThranQuarryTriggeredAbility extends TriggeredAbilityImpl {
 
     ThranQuarryTriggeredAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
diff --git a/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java b/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java
index e32704bc0ce..2805c56831d 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/TitaniasChosen.java
@@ -72,7 +72,7 @@ public class TitaniasChosen extends CardImpl<TitaniasChosen> {
 
 }
 
-class TitaniasChosenAbility extends TriggeredAbilityImpl<TitaniasChosenAbility> {
+class TitaniasChosenAbility extends TriggeredAbilityImpl {
 
     public TitaniasChosenAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()));
diff --git a/Mage.Sets/src/mage/sets/visions/UndiscoveredParadise.java b/Mage.Sets/src/mage/sets/visions/UndiscoveredParadise.java
index 636e7df9ed5..1a50aecda4f 100644
--- a/Mage.Sets/src/mage/sets/visions/UndiscoveredParadise.java
+++ b/Mage.Sets/src/mage/sets/visions/UndiscoveredParadise.java
@@ -99,7 +99,7 @@ class UndiscoveredParadiseEffect extends OneShotEffect<UndiscoveredParadiseEffec
     }
 }
 
-class AtBeginningOfUntapDelayedTriggeredAbility extends DelayedTriggeredAbility<AtBeginningOfUntapDelayedTriggeredAbility> {
+class AtBeginningOfUntapDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public AtBeginningOfUntapDelayedTriggeredAbility(Effect effect) {
         super(effect);
diff --git a/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java b/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java
index 8d476c54622..7c4a18087d8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java
+++ b/Mage.Sets/src/mage/sets/worldwake/AmuletOfVigor.java
@@ -62,7 +62,7 @@ public class AmuletOfVigor extends CardImpl<AmuletOfVigor> {
     }
 }
 
-class AmuletOfVigorTriggeredAbility extends TriggeredAbilityImpl<AmuletOfVigorTriggeredAbility> {
+class AmuletOfVigorTriggeredAbility extends TriggeredAbilityImpl {
     AmuletOfVigorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new UntapTargetEffect());
     }
diff --git a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
index 8e289036d46..6c2158ec954 100644
--- a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
+++ b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
@@ -75,7 +75,7 @@ public class ArchonOfRedemption extends CardImpl<ArchonOfRedemption> {
     }
 }
 
-class ArchonOfRedemptionTriggeredAbility extends TriggeredAbilityImpl<ArchonOfRedemptionTriggeredAbility> {
+class ArchonOfRedemptionTriggeredAbility extends TriggeredAbilityImpl {
     ArchonOfRedemptionTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ArchonOfRedemptionEffect(), true);
     }
diff --git a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java
index aecebb11a81..701cabd59e5 100644
--- a/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java
+++ b/Mage.Sets/src/mage/sets/worldwake/BrinkOfDisaster.java
@@ -87,7 +87,7 @@ public class BrinkOfDisaster extends CardImpl<BrinkOfDisaster> {
     }
 }
 
-class EnchantedBecomesTappedTriggeredAbility extends TriggeredAbilityImpl<EnchantedBecomesTappedTriggeredAbility> {
+class EnchantedBecomesTappedTriggeredAbility extends TriggeredAbilityImpl {
 
     public EnchantedBecomesTappedTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
index 40c356fefb2..5cfcfa7c623 100644
--- a/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
+++ b/Mage.Sets/src/mage/sets/worldwake/HammerOfRuin.java
@@ -80,7 +80,7 @@ public class HammerOfRuin extends CardImpl<HammerOfRuin> {
 
 }
 
-class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl<HammerOfRuinTriggeredAbility> {
+class HammerOfRuinTriggeredAbility extends TriggeredAbilityImpl {
 
     HammerOfRuinTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
index 0ae364c7d1c..7799586b297 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KalastriaHighborn.java
@@ -74,7 +74,7 @@ public class KalastriaHighborn extends CardImpl<KalastriaHighborn> {
     }
 }
 
-class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl<KalastriaHighbornTriggeredAbility> {
+class KalastriaHighbornTriggeredAbility extends TriggeredAbilityImpl {
     KalastriaHighbornTriggeredAbility ( ) {
         super(Zone.ALL, new LoseLifeTargetEffect(2), false);
         this.addCost(new ManaCostsImpl("{B}"));
diff --git a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
index 8ab1577b163..7bdd564f46e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KazuulTyrantOfTheCliffs.java
@@ -78,7 +78,7 @@ public class KazuulTyrantOfTheCliffs extends CardImpl<KazuulTyrantOfTheCliffs> {
     }
 }
 
-class KazuulTyrantOfTheCliffsTriggeredAbility extends TriggeredAbilityImpl<KazuulTyrantOfTheCliffsTriggeredAbility> {
+class KazuulTyrantOfTheCliffsTriggeredAbility extends TriggeredAbilityImpl {
 
     public KazuulTyrantOfTheCliffsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new KazuulTyrantOfTheCliffsEffect(new GenericManaCost(3)));
diff --git a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java
index d58d6433854..80fbb1149f8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java
+++ b/Mage.Sets/src/mage/sets/worldwake/KorFirewalker.java
@@ -81,7 +81,7 @@ public class KorFirewalker extends CardImpl<KorFirewalker> {
 
 }
 
-class KorFirewalkerAbility extends TriggeredAbilityImpl<KorFirewalkerAbility> {
+class KorFirewalkerAbility extends TriggeredAbilityImpl {
 
     public KorFirewalkerAbility() {
         super(Zone.BATTLEFIELD, new GainLifeEffect(1), true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java b/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java
index 0a60df20a9e..532a9a80da8 100644
--- a/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java
+++ b/Mage.Sets/src/mage/sets/worldwake/PerimeterCaptain.java
@@ -75,7 +75,7 @@ public class PerimeterCaptain extends CardImpl<PerimeterCaptain> {
     }
 }
 
-class PerimeterCaptainTriggeredAbility extends TriggeredAbilityImpl<PerimeterCaptainTriggeredAbility> {
+class PerimeterCaptainTriggeredAbility extends TriggeredAbilityImpl {
 
     public PerimeterCaptainTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
index 5fdb464c3f7..41a8f2bb90a 100644
--- a/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
+++ b/Mage.Sets/src/mage/sets/worldwake/QuestForTheNihilStone.java
@@ -74,7 +74,7 @@ public class QuestForTheNihilStone extends CardImpl<QuestForTheNihilStone> {
     }
 }
 
-class QuestForTheNihilStoneTriggeredAbility extends TriggeredAbilityImpl<QuestForTheNihilStoneTriggeredAbility> {
+class QuestForTheNihilStoneTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuestForTheNihilStoneTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance(), true), true);
@@ -103,7 +103,7 @@ class QuestForTheNihilStoneTriggeredAbility extends TriggeredAbilityImpl<QuestFo
     }
 }
 
-class QuestForTheNihilStoneTriggeredAbility2 extends TriggeredAbilityImpl<QuestForTheNihilStoneTriggeredAbility2> {
+class QuestForTheNihilStoneTriggeredAbility2 extends TriggeredAbilityImpl {
 
     public QuestForTheNihilStoneTriggeredAbility2() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(5), true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java b/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java
index b77ce1374f9..b2f9b909b0e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java
+++ b/Mage.Sets/src/mage/sets/worldwake/QuestForUlasTemple.java
@@ -116,7 +116,7 @@ class QuestForUlasTempleEffect extends OneShotEffect<QuestForUlasTempleEffect> {
     }
 }
 
-class QuestForUlasTempleTriggeredAbility extends TriggeredAbilityImpl<QuestForUlasTempleTriggeredAbility> {
+class QuestForUlasTempleTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuestForUlasTempleTriggeredAbility() {
         super(Zone.BATTLEFIELD, new QuestForUlasTempleEffect2(), true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
index 4340405d4b8..3d60c867b1f 100644
--- a/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
+++ b/Mage.Sets/src/mage/sets/worldwake/RumblingAftershocks.java
@@ -83,7 +83,7 @@ public class RumblingAftershocks extends CardImpl<RumblingAftershocks> {
     }
 }
 
-class RumblingAftershocksTriggeredAbility extends TriggeredAbilityImpl<RumblingAftershocksTriggeredAbility> {
+class RumblingAftershocksTriggeredAbility extends TriggeredAbilityImpl {
 
     RumblingAftershocksTriggeredAbility() {
         super(Zone.BATTLEFIELD, new RumblingAftershocksDealDamageEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java
index 653a15f0139..29a3613aeec 100644
--- a/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java
+++ b/Mage.Sets/src/mage/sets/worldwake/SlaveringNulls.java
@@ -76,7 +76,7 @@ public class SlaveringNulls extends CardImpl<SlaveringNulls> {
     }
 }
 
-class SlaveringNullsTriggeredAbility extends TriggeredAbilityImpl<SlaveringNullsTriggeredAbility> {
+class SlaveringNullsTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
index 778d1b0e511..672b392b5ff 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TalusPaladin.java
@@ -80,7 +80,7 @@ public class TalusPaladin extends CardImpl<TalusPaladin> {
     }
 }
 
-class TalusPaladinTriggeredAbility extends TriggeredAbilityImpl<TalusPaladinTriggeredAbility> {
+class TalusPaladinTriggeredAbility extends TriggeredAbilityImpl {
     
     private static final FilterControlledPermanent filter = new FilterControlledPermanent("all allies you control");
     
diff --git a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
index a24a1538828..7f40dab0d0b 100644
--- a/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
+++ b/Mage.Sets/src/mage/sets/worldwake/TuktukScrapper.java
@@ -76,7 +76,7 @@ public class TuktukScrapper extends CardImpl<TuktukScrapper> {
     }
 }
 
-class TuktukScrapperTriggeredAbility extends TriggeredAbilityImpl<TuktukScrapperTriggeredAbility> {
+class TuktukScrapperTriggeredAbility extends TriggeredAbilityImpl {
 
     public TuktukScrapperTriggeredAbility() {
         super(Zone.BATTLEFIELD, new TuktukScrapperEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
index b167818cfe3..d557ccdbeb7 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ArchmageAscension.java
@@ -77,7 +77,7 @@ public class ArchmageAscension extends CardImpl<ArchmageAscension> {
     }
 }
 
-class ArchmageAscensionTriggeredAbility extends TriggeredAbilityImpl<ArchmageAscensionTriggeredAbility> {
+class ArchmageAscensionTriggeredAbility extends TriggeredAbilityImpl {
 
     public ArchmageAscensionTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance(1)), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java b/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java
index fa16b812a11..94f9837d65c 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BladeOfTheBloodchief.java
@@ -71,7 +71,7 @@ public class BladeOfTheBloodchief extends CardImpl<BladeOfTheBloodchief> {
     }
 }
 
-class BladeOfTheBloodChiefTriggeredAbility extends TriggeredAbilityImpl<BladeOfTheBloodChiefTriggeredAbility> {
+class BladeOfTheBloodChiefTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final String text = "Whenever a creature dies, put a +1/+1 counter on equipped "
             + "creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead.";
diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java b/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java
index 7e352e055fc..2949b81c497 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BloodSeeker.java
@@ -72,7 +72,7 @@ public class BloodSeeker extends CardImpl<BloodSeeker> {
     }
 }
 
-class BloodSeekerTriggeredAbility extends TriggeredAbilityImpl<BloodSeekerTriggeredAbility> {
+class BloodSeekerTriggeredAbility extends TriggeredAbilityImpl {
     BloodSeekerTriggeredAbility() {
         super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), true);
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
index f8a22358234..eac66b4ff1d 100644
--- a/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/BloodchiefAscension.java
@@ -82,7 +82,7 @@ public class BloodchiefAscension extends CardImpl<BloodchiefAscension> {
     }
 }
 
-class BloodchiefAscensionTriggeredAbility extends TriggeredAbilityImpl<BloodchiefAscensionTriggeredAbility> {
+class BloodchiefAscensionTriggeredAbility extends TriggeredAbilityImpl {
 
     private Condition condition;
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java
index c17821b50ee..2c4d426f524 100644
--- a/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java
+++ b/Mage.Sets/src/mage/sets/zendikar/CelestialMantle.java
@@ -80,7 +80,7 @@ public class CelestialMantle extends CardImpl<CelestialMantle> {
 
 }
 
-class CelestialMantleAbility extends TriggeredAbilityImpl<CelestialMantleAbility> {
+class CelestialMantleAbility extends TriggeredAbilityImpl {
 
     public CelestialMantleAbility() {
         super(Zone.BATTLEFIELD, new CelestialMantleEffect());
diff --git a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java
index 6dfc10986ec..6961f614b71 100644
--- a/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java
+++ b/Mage.Sets/src/mage/sets/zendikar/CosisTrickster.java
@@ -68,7 +68,7 @@ public class CosisTrickster extends CardImpl<CosisTrickster> {
     }
 }
 
-class CosisTricksterTriggeredAbility extends TriggeredAbilityImpl<CosisTricksterTriggeredAbility> {
+class CosisTricksterTriggeredAbility extends TriggeredAbilityImpl {
 
     public CosisTricksterTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
index 4ba7037baaa..69c5f80f145 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Electropotence.java
@@ -72,7 +72,7 @@ public class Electropotence extends CardImpl<Electropotence> {
     }
 }
 
-class ElectropotenceTriggeredAbility extends TriggeredAbilityImpl<ElectropotenceTriggeredAbility> {
+class ElectropotenceTriggeredAbility extends TriggeredAbilityImpl {
 
     public ElectropotenceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ElectropotenceEffect());
diff --git a/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java b/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java
index 1b27a387ca7..122c14f3206 100644
--- a/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java
+++ b/Mage.Sets/src/mage/sets/zendikar/EmeriaTheSkyRuin.java
@@ -73,7 +73,7 @@ public class EmeriaTheSkyRuin extends CardImpl<EmeriaTheSkyRuin> {
     }
 }
 
-class EmeriaTheSkyRuinTriggeredAbility extends TriggeredAbilityImpl<EmeriaTheSkyRuinTriggeredAbility> {
+class EmeriaTheSkyRuinTriggeredAbility extends TriggeredAbilityImpl {
 
     static final FilterLandPermanent filter = new FilterLandPermanent("Plains");
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
index 698375013f2..b30de187150 100644
--- a/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
+++ b/Mage.Sets/src/mage/sets/zendikar/Gigantiform.java
@@ -98,7 +98,7 @@ public class Gigantiform extends CardImpl<Gigantiform> {
     }
 }
 
-class GigantiformAbility extends StaticAbility<GigantiformAbility> {
+class GigantiformAbility extends StaticAbility {
 
     public GigantiformAbility() {
         super(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(TrampleAbility.getInstance(), AttachmentType.AURA));
diff --git a/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java b/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java
index 1896e92d2f1..0b6d09b5f9f 100644
--- a/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java
+++ b/Mage.Sets/src/mage/sets/zendikar/HellfireMongrel.java
@@ -70,7 +70,7 @@ public class HellfireMongrel extends CardImpl<HellfireMongrel> {
     }
 }
 
-class HellfireMongrelTriggeredAbility extends TriggeredAbilityImpl<HellfireMongrelTriggeredAbility> {
+class HellfireMongrelTriggeredAbility extends TriggeredAbilityImpl {
 
     public HellfireMongrelTriggeredAbility() {
         super(Zone.BATTLEFIELD, null);
diff --git a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
index 501d69e4293..e316b91ad43 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LullmageMentor.java
@@ -98,7 +98,7 @@ public class LullmageMentor extends CardImpl<LullmageMentor> {
     }
 }
 
-class LullmageMentorTriggeredAbility extends TriggeredAbilityImpl<LullmageMentorTriggeredAbility> {
+class LullmageMentorTriggeredAbility extends TriggeredAbilityImpl {
 
     public LullmageMentorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CreateTokenEffect(new MerfolkToken()), false);
diff --git a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java
index 4f22a51d2e1..b42e35bd46b 100644
--- a/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/LuminarchAscension.java
@@ -81,7 +81,7 @@ public class LuminarchAscension extends CardImpl<LuminarchAscension> {
     }
 }
 
-class LuminarchAscensionTriggeredAbility extends TriggeredAbilityImpl<LuminarchAscensionTriggeredAbility> {
+class LuminarchAscensionTriggeredAbility extends TriggeredAbilityImpl {
 
         public LuminarchAscensionTriggeredAbility() {
             super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java
index 71a5014109d..202a0cf7176 100644
--- a/Mage.Sets/src/mage/sets/zendikar/MireBlight.java
+++ b/Mage.Sets/src/mage/sets/zendikar/MireBlight.java
@@ -78,7 +78,7 @@ public class MireBlight extends CardImpl<MireBlight> {
     }
 }
 
-class MireBlightTriggeredAbility extends TriggeredAbilityImpl<MireBlightTriggeredAbility> {
+class MireBlightTriggeredAbility extends TriggeredAbilityImpl {
 
     public MireBlightTriggeredAbility() {
         super(Zone.BATTLEFIELD, new DestroyTargetEffect());
diff --git a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java
index 768563d71b7..61f6e3d4bfa 100644
--- a/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java
+++ b/Mage.Sets/src/mage/sets/zendikar/PunishingFire.java
@@ -70,7 +70,7 @@ public class PunishingFire extends CardImpl<PunishingFire> {
     }
 }
 
-class PunishingFireTriggeredAbility extends TriggeredAbilityImpl<PunishingFireTriggeredAbility> {
+class PunishingFireTriggeredAbility extends TriggeredAbilityImpl {
 
     public PunishingFireTriggeredAbility() {
         super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{R}")));
diff --git a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java
index 6a14431e88e..69978917478 100644
--- a/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java
+++ b/Mage.Sets/src/mage/sets/zendikar/PyromancerAscension.java
@@ -76,7 +76,7 @@ public class PyromancerAscension extends CardImpl<PyromancerAscension> {
 
 }
 
-class PyromancerAscensionQuestTriggeredAbility extends TriggeredAbilityImpl<PyromancerAscensionQuestTriggeredAbility> {
+class PyromancerAscensionQuestTriggeredAbility extends TriggeredAbilityImpl {
 
     PyromancerAscensionQuestTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance(), true), true);
@@ -124,7 +124,7 @@ class PyromancerAscensionQuestTriggeredAbility extends TriggeredAbilityImpl<Pyro
     }
 }
 
-class PyromancerAscensionCopyTriggeredAbility extends TriggeredAbilityImpl<PyromancerAscensionCopyTriggeredAbility> {
+class PyromancerAscensionCopyTriggeredAbility extends TriggeredAbilityImpl {
 
     PyromancerAscensionCopyTriggeredAbility() {
         super(Zone.BATTLEFIELD, new CopyTargetSpellEffect(), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java
index b086ab18c11..b2a43dbf91e 100644
--- a/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java
+++ b/Mage.Sets/src/mage/sets/zendikar/QuestForAncientSecrets.java
@@ -81,7 +81,7 @@ public class QuestForAncientSecrets extends CardImpl<QuestForAncientSecrets> {
     }
 }
 
-class QuestForAncientSecretsTriggeredAbility extends TriggeredAbilityImpl<QuestForAncientSecretsTriggeredAbility> {
+class QuestForAncientSecretsTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuestForAncientSecretsTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java b/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java
index af49838576a..7e2d018b058 100644
--- a/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java
+++ b/Mage.Sets/src/mage/sets/zendikar/QuestForPureFlame.java
@@ -80,7 +80,7 @@ public class QuestForPureFlame extends CardImpl<QuestForPureFlame> {
     }
 }
 
-class QuestForPureFlameTriggeredAbility extends TriggeredAbilityImpl<QuestForPureFlameTriggeredAbility> {
+class QuestForPureFlameTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuestForPureFlameTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java
index 9159cb8ba21..907bef2fd5b 100644
--- a/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java
+++ b/Mage.Sets/src/mage/sets/zendikar/QuestForTheGemblades.java
@@ -78,7 +78,7 @@ public class QuestForTheGemblades extends CardImpl<QuestForTheGemblades> {
     }
 }
 
-class QuestForTheGembladesTriggeredAbility extends TriggeredAbilityImpl<QuestForTheGembladesTriggeredAbility> {
+class QuestForTheGembladesTriggeredAbility extends TriggeredAbilityImpl {
 
     public QuestForTheGembladesTriggeredAbility() {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java b/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java
index eef8591041d..b4d14953e3e 100644
--- a/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java
+++ b/Mage.Sets/src/mage/sets/zendikar/RuinousMinotaur.java
@@ -71,7 +71,7 @@ public class RuinousMinotaur extends CardImpl<RuinousMinotaur> {
     }
 }
 
-class RuinousMinotaurTriggeredAbility extends TriggeredAbilityImpl<RuinousMinotaurTriggeredAbility> {
+class RuinousMinotaurTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterControlledPermanent filter = new FilterControlledLandPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java
index 29238cb52db..20db9a9369c 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ScuteMob.java
@@ -69,7 +69,7 @@ public class ScuteMob extends CardImpl<ScuteMob> {
 
 }
 
-class ScuteMobAbility extends TriggeredAbilityImpl<ScuteMobAbility> {
+class ScuteMobAbility extends TriggeredAbilityImpl {
 
     private FilterLandPermanent filter = new FilterLandPermanent();
 
diff --git a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java
index 37e39189584..24f7513f61b 100644
--- a/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java
+++ b/Mage.Sets/src/mage/sets/zendikar/SphinxOfJwarIsle.java
@@ -78,7 +78,7 @@ public class SphinxOfJwarIsle extends CardImpl<SphinxOfJwarIsle> {
     }
 }
 
-class SphinxOfJwarIsleLookAbility extends ActivatedAbilityImpl<SphinxOfJwarIsleLookAbility> {
+class SphinxOfJwarIsleLookAbility extends ActivatedAbilityImpl {
 
     public SphinxOfJwarIsleLookAbility() {
         super(Zone.BATTLEFIELD, new SphinxOfJwarIsleEffect(), new GenericManaCost(0));
diff --git a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
index 08de03df366..eceac59787c 100644
--- a/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
+++ b/Mage.Sets/src/mage/sets/zendikar/ValakutTheMoltenPinnacle.java
@@ -83,7 +83,7 @@ public class ValakutTheMoltenPinnacle extends CardImpl<ValakutTheMoltenPinnacle>
     }
 }
 
-class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl<ValakutTheMoltenPinnacleTriggeredAbility> {
+class ValakutTheMoltenPinnacleTriggeredAbility extends TriggeredAbilityImpl {
 
     ValakutTheMoltenPinnacleTriggeredAbility () {
         super(Zone.BATTLEFIELD, new DamageTargetEffect(3), true);
diff --git a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java
index c3f904555f2..ce303fb24eb 100644
--- a/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java
+++ b/Mage.Sets/src/mage/sets/zendikar/WarrenInstigator.java
@@ -76,7 +76,7 @@ public class WarrenInstigator extends CardImpl<WarrenInstigator> {
     }
 }
 
-class WarrenInstigatorTriggeredAbility extends TriggeredAbilityImpl<WarrenInstigatorTriggeredAbility> {
+class WarrenInstigatorTriggeredAbility extends TriggeredAbilityImpl {
 
     public WarrenInstigatorTriggeredAbility() {
         super(Zone.BATTLEFIELD, new WarrenInstigatorEffect(), true);
diff --git a/Mage/src/mage/abilities/AbilityImpl.java b/Mage/src/mage/abilities/AbilityImpl.java
index 3a9f11e2601..1b06c41144b 100644
--- a/Mage/src/mage/abilities/AbilityImpl.java
+++ b/Mage/src/mage/abilities/AbilityImpl.java
@@ -73,9 +73,8 @@ import org.apache.log4j.Logger;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
+public abstract class AbilityImpl implements Ability {
 
     private static final transient Logger logger = Logger.getLogger(AbilityImpl.class);
 
@@ -99,9 +98,6 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
     protected boolean ruleAdditionalCostsVisible = true;
     protected boolean costModificationActive = true;
 
-    @Override
-    public abstract T copy();
-
     public AbilityImpl(AbilityType abilityType, Zone zone) {
         this.id = UUID.randomUUID();
         this.originalId = id;
@@ -114,7 +110,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
         this.modes = new Modes();
     }
 
-    public AbilityImpl(final AbilityImpl<T> ability) {
+    public AbilityImpl(final AbilityImpl ability) {
         this.id = ability.id;
         this.originalId = ability.originalId;
         this.abilityType = ability.abilityType;
diff --git a/Mage/src/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/mage/abilities/ActivatedAbilityImpl.java
index 18be8da6ba3..8f799183034 100644
--- a/Mage/src/mage/abilities/ActivatedAbilityImpl.java
+++ b/Mage/src/mage/abilities/ActivatedAbilityImpl.java
@@ -47,9 +47,8 @@ import mage.game.Game;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> extends AbilityImpl<T> implements ActivatedAbility {
+public abstract class ActivatedAbilityImpl extends AbilityImpl implements ActivatedAbility {
 
     protected TimingRule timing = TimingRule.INSTANT;
     protected TargetController mayActivate = TargetController.YOU;
@@ -151,6 +150,9 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
         }
     }
 
+    @Override
+    public abstract ActivatedAbilityImpl copy();
+
     @Override
     public boolean canActivate(UUID playerId, Game game) {
         //20091005 - 602.2
diff --git a/Mage/src/mage/abilities/DelayedTriggeredAbility.java b/Mage/src/mage/abilities/DelayedTriggeredAbility.java
index 3a313ea72bf..380a842b484 100644
--- a/Mage/src/mage/abilities/DelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/DelayedTriggeredAbility.java
@@ -36,7 +36,7 @@ import mage.abilities.effects.Effect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class DelayedTriggeredAbility<T extends DelayedTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+public abstract class DelayedTriggeredAbility extends TriggeredAbilityImpl {
 
     private Duration duration;
     private Boolean triggerOnlyOnce;
@@ -62,7 +62,7 @@ public abstract class DelayedTriggeredAbility<T extends DelayedTriggeredAbility<
     }
 
     @Override
-    public abstract T copy();
+    public abstract DelayedTriggeredAbility copy();
 
     public Duration getDuration() {
         return duration;
diff --git a/Mage/src/mage/abilities/EvasionAbility.java b/Mage/src/mage/abilities/EvasionAbility.java
index 57d7c416771..81c040d0581 100644
--- a/Mage/src/mage/abilities/EvasionAbility.java
+++ b/Mage/src/mage/abilities/EvasionAbility.java
@@ -34,9 +34,8 @@ import mage.constants.Zone;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class EvasionAbility<T extends EvasionAbility<T>> extends StaticAbility<T> {
+public abstract class EvasionAbility extends StaticAbility {
 
     public EvasionAbility() {
         super(AbilityType.EVASION, Zone.BATTLEFIELD);
diff --git a/Mage/src/mage/abilities/LoyaltyAbility.java b/Mage/src/mage/abilities/LoyaltyAbility.java
index 0b59850b093..677e4276bf4 100644
--- a/Mage/src/mage/abilities/LoyaltyAbility.java
+++ b/Mage/src/mage/abilities/LoyaltyAbility.java
@@ -39,7 +39,7 @@ import mage.abilities.effects.Effects;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LoyaltyAbility extends ActivatedAbilityImpl<LoyaltyAbility> {
+public class LoyaltyAbility extends ActivatedAbilityImpl {
 
     public LoyaltyAbility(Effect effect, int loyalty) {
         super(Zone.BATTLEFIELD, effect, new PayLoyaltyCost(loyalty));
diff --git a/Mage/src/mage/abilities/PlayLandAbility.java b/Mage/src/mage/abilities/PlayLandAbility.java
index 61ebf7a540e..fdcd5d74da3 100644
--- a/Mage/src/mage/abilities/PlayLandAbility.java
+++ b/Mage/src/mage/abilities/PlayLandAbility.java
@@ -37,7 +37,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PlayLandAbility extends ActivatedAbilityImpl<PlayLandAbility> {
+public class PlayLandAbility extends ActivatedAbilityImpl {
 
     public PlayLandAbility(String cardName) {
         super(AbilityType.PLAY_LAND, Zone.HAND);
diff --git a/Mage/src/mage/abilities/SpecialAction.java b/Mage/src/mage/abilities/SpecialAction.java
index cdfd568e683..daa9e191432 100644
--- a/Mage/src/mage/abilities/SpecialAction.java
+++ b/Mage/src/mage/abilities/SpecialAction.java
@@ -36,7 +36,7 @@ import mage.constants.Zone;
  * @author BetaSteward_at_googlemail.com
  * @param <T>
  */
-public abstract class SpecialAction<T extends SpecialAction<T>> extends ActivatedAbilityImpl<T> {
+public abstract class SpecialAction<T extends SpecialAction<T>> extends ActivatedAbilityImpl {
 
     public SpecialAction() {
         super(AbilityType.SPECIAL_ACTION, Zone.ALL);
diff --git a/Mage/src/mage/abilities/SpellAbility.java b/Mage/src/mage/abilities/SpellAbility.java
index 9cf827df32e..028b4b7cb34 100644
--- a/Mage/src/mage/abilities/SpellAbility.java
+++ b/Mage/src/mage/abilities/SpellAbility.java
@@ -44,7 +44,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SpellAbility extends ActivatedAbilityImpl<SpellAbility> {
+public class SpellAbility extends ActivatedAbilityImpl {
 
     private SpellAbilityType spellAbilityType;
 
diff --git a/Mage/src/mage/abilities/StateTriggeredAbility.java b/Mage/src/mage/abilities/StateTriggeredAbility.java
index 292330e0e90..6b0d9e6f613 100644
--- a/Mage/src/mage/abilities/StateTriggeredAbility.java
+++ b/Mage/src/mage/abilities/StateTriggeredAbility.java
@@ -36,9 +36,8 @@ import mage.game.Game;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class StateTriggeredAbility<T extends StateTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+public abstract class StateTriggeredAbility extends TriggeredAbilityImpl {
 
     public StateTriggeredAbility(Zone zone, Effect effect) {
         super(zone, effect);
diff --git a/Mage/src/mage/abilities/StaticAbility.java b/Mage/src/mage/abilities/StaticAbility.java
index 6a0def64c6f..a0d8dd8e6e1 100644
--- a/Mage/src/mage/abilities/StaticAbility.java
+++ b/Mage/src/mage/abilities/StaticAbility.java
@@ -35,9 +35,8 @@ import mage.abilities.effects.Effect;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class StaticAbility<T extends StaticAbility<T>> extends AbilityImpl<T> {
+public abstract class StaticAbility extends AbilityImpl {
 
     protected StaticAbility(AbilityType abilityType, Zone zone) {
         super(abilityType, zone);
@@ -50,7 +49,7 @@ public abstract class StaticAbility<T extends StaticAbility<T>> extends AbilityI
         }
     }
 
-    public StaticAbility(StaticAbility<T> ability) {
+    public StaticAbility(StaticAbility ability) {
         super(ability);
     }
 }
diff --git a/Mage/src/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/mage/abilities/TriggeredAbilityImpl.java
index d098626e3d0..1fac0c451a1 100644
--- a/Mage/src/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/mage/abilities/TriggeredAbilityImpl.java
@@ -39,9 +39,8 @@ import mage.players.Player;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class TriggeredAbilityImpl<T extends TriggeredAbilityImpl<T>> extends AbilityImpl<T> implements TriggeredAbility {
+public abstract class TriggeredAbilityImpl extends AbilityImpl implements TriggeredAbility {
 
     protected boolean optional;
 
@@ -57,7 +56,7 @@ public abstract class TriggeredAbilityImpl<T extends TriggeredAbilityImpl<T>> ex
         this.optional = optional;
     }
 
-    public TriggeredAbilityImpl(final TriggeredAbilityImpl<T> ability) {
+    public TriggeredAbilityImpl(final TriggeredAbilityImpl ability) {
         super(ability);
         this.optional = ability.optional;
     }
diff --git a/Mage/src/mage/abilities/abilityword/ConstellationAbility.java b/Mage/src/mage/abilities/abilityword/ConstellationAbility.java
index bd48575c0c3..7b3fc33149a 100644
--- a/Mage/src/mage/abilities/abilityword/ConstellationAbility.java
+++ b/Mage/src/mage/abilities/abilityword/ConstellationAbility.java
@@ -44,7 +44,7 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class ConstellationAbility extends TriggeredAbilityImpl<ConstellationAbility> {
+public class ConstellationAbility extends TriggeredAbilityImpl {
 
     public ConstellationAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/abilityword/KinshipAbility.java b/Mage/src/mage/abilities/abilityword/KinshipAbility.java
index cd2c867472d..b15857d627b 100644
--- a/Mage/src/mage/abilities/abilityword/KinshipAbility.java
+++ b/Mage/src/mage/abilities/abilityword/KinshipAbility.java
@@ -51,7 +51,7 @@ import mage.util.CardUtil;
  *
  * @author LevelX2
  */
-public class KinshipAbility extends TriggeredAbilityImpl<KinshipAbility> {
+public class KinshipAbility extends TriggeredAbilityImpl {
     
     public KinshipAbility(Effect kinshipEffect) {
         super(Zone.BATTLEFIELD, new KinshipBaseEffect(kinshipEffect), true);        
diff --git a/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java
index b3ed3110b63..134a9597c35 100644
--- a/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/ActivateAsSorceryActivatedAbility.java
@@ -33,7 +33,7 @@ import mage.abilities.effects.Effect;
 import mage.constants.TimingRule;
 import mage.constants.Zone;
 
-public class ActivateAsSorceryActivatedAbility extends ActivatedAbilityImpl<ActivateAsSorceryActivatedAbility> {
+public class ActivateAsSorceryActivatedAbility extends ActivatedAbilityImpl {
     public ActivateAsSorceryActivatedAbility(Zone zone, Effect effect, Cost cost) {
         super(zone, effect, cost);
         timing = TimingRule.SORCERY;
diff --git a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java
index 2eace80c586..8c7cc7b8bde 100644
--- a/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/ActivateIfConditionActivatedAbility.java
@@ -41,7 +41,7 @@ import mage.game.Game;
  *
  * @author LevelX2
  */
-public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl<ActivateIfConditionActivatedAbility> {
+public class ActivateIfConditionActivatedAbility extends ActivatedAbilityImpl {
 
     private final Condition condition;
 
diff --git a/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java
index be8861e3b28..2318d00cecd 100644
--- a/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AnotherCreatureEntersBattlefieldTriggeredAbility.java
@@ -8,7 +8,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
-public class AnotherCreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl<AnotherCreatureEntersBattlefieldTriggeredAbility> {
+public class AnotherCreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
 
     public AnotherCreatureEntersBattlefieldTriggeredAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java
index d2a690bca75..05a9020fcf7 100644
--- a/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java
+++ b/Mage/src/mage/abilities/common/AsEntersBattlefieldAbility.java
@@ -36,7 +36,7 @@ import mage.constants.Zone;
  *
  * @author North
  */
-public class AsEntersBattlefieldAbility extends StaticAbility<AsEntersBattlefieldAbility> {
+public class AsEntersBattlefieldAbility extends StaticAbility {
 
     public AsEntersBattlefieldAbility(Effect effect) {
         super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(effect));
diff --git a/Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java
index 83ea768593e..4467e38ab33 100644
--- a/Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksAttachedTriggeredAbility.java
@@ -42,7 +42,7 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class AttacksAttachedTriggeredAbility extends TriggeredAbilityImpl<AttacksAttachedTriggeredAbility> {
+public class AttacksAttachedTriggeredAbility extends TriggeredAbilityImpl {
     
     private AttachmentType attachmentType;
     
diff --git a/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java
index 05062d1713b..75f5cd21150 100644
--- a/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksCreatureYourControlTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author noxx
  */
-public class AttacksCreatureYourControlTriggeredAbility extends TriggeredAbilityImpl<AttacksCreatureYourControlTriggeredAbility> {
+public class AttacksCreatureYourControlTriggeredAbility extends TriggeredAbilityImpl {
 
     protected FilterControlledCreaturePermanent filter;
     protected boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java b/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java
index c15f474dd54..19951542b6a 100644
--- a/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksEachTurnStaticAbility.java
@@ -37,7 +37,7 @@ import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class AttacksEachTurnStaticAbility extends StaticAbility<AttacksEachTurnStaticAbility> {
+public class AttacksEachTurnStaticAbility extends StaticAbility {
 
     public AttacksEachTurnStaticAbility() {
         super(Zone.BATTLEFIELD, new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield));
diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java
index d8b15e5f578..5f31fa7d670 100644
--- a/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksOrBlocksEnchantedTriggeredAbility.java
@@ -9,7 +9,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
-public class AttacksOrBlocksEnchantedTriggeredAbility extends TriggeredAbilityImpl<AttacksOrBlocksEnchantedTriggeredAbility> {
+public class AttacksOrBlocksEnchantedTriggeredAbility extends TriggeredAbilityImpl {
 
     public AttacksOrBlocksEnchantedTriggeredAbility(Zone zone, Effect effect) {
         super(zone, effect);
diff --git a/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
index f1047532c97..cb6be2c0aad 100644
--- a/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
@@ -6,7 +6,7 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
-public class AttacksOrBlocksTriggeredAbility extends TriggeredAbilityImpl<AttacksOrBlocksTriggeredAbility> {
+public class AttacksOrBlocksTriggeredAbility extends TriggeredAbilityImpl {
     public AttacksOrBlocksTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
     }
diff --git a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java
index ab2ef7f2b3d..e0be225024c 100644
--- a/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/AttacksTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class AttacksTriggeredAbility extends TriggeredAbilityImpl<AttacksTriggeredAbility> {
+public class AttacksTriggeredAbility extends TriggeredAbilityImpl {
     
     protected String text;
 
diff --git a/Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java
index acc8a6ec843..4c20e9162f5 100644
--- a/Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesBlockedAllTriggeredAbility.java
@@ -43,7 +43,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class BecomesBlockedAllTriggeredAbility extends TriggeredAbilityImpl<BecomesBlockedAllTriggeredAbility> {
+public class BecomesBlockedAllTriggeredAbility extends TriggeredAbilityImpl {
 
     private FilterCreaturePermanent filter;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
index 8bd648281e2..b5e565eba24 100644
--- a/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author North
  */
-public class BecomesBlockedByCreatureTriggeredAbility extends TriggeredAbilityImpl<BecomesBlockedByCreatureTriggeredAbility> {
+public class BecomesBlockedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesBlockedByCreatureTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java
index 9f650b90964..b757fc8eab2 100644
--- a/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesBlockedTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author North
  */
-public class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl<BecomesBlockedTriggeredAbility> {
+public class BecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesBlockedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java
index a8e1c783e1e..0a0e6a8e081 100644
--- a/Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesMonstrousSourceTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author LevelX2
  */
-public class BecomesMonstrousSourceTriggeredAbility extends TriggeredAbilityImpl<BecomesMonstrousSourceTriggeredAbility> {
+public class BecomesMonstrousSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     private int monstrosityValue;
 
diff --git a/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java
index 1e25d1a4656..1b87d768792 100644
--- a/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesTappedCreatureControlledTriggeredAbility.java
@@ -16,7 +16,7 @@ import mage.game.permanent.Permanent;
  *
  * @author Jeff
  */
-public class BecomesTappedCreatureControlledTriggeredAbility extends TriggeredAbilityImpl<BecomesTappedCreatureControlledTriggeredAbility>{
+public class BecomesTappedCreatureControlledTriggeredAbility extends TriggeredAbilityImpl{
     
     public BecomesTappedCreatureControlledTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java
index 908d1f48011..d5f09caeeb2 100644
--- a/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesTappedTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author nantuko
  */
-public class BecomesTappedTriggeredAbility extends TriggeredAbilityImpl<BecomesTappedTriggeredAbility> {
+public class BecomesTappedTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesTappedTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java
index f00d71da55c..1e6e62be7e5 100644
--- a/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesTargetControllerSpellTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.stack.Spell;
 /**
  * @author jeffwadsworth
  */
-public class BecomesTargetControllerSpellTriggeredAbility extends TriggeredAbilityImpl<BecomesTargetControllerSpellTriggeredAbility> {
+public class BecomesTargetControllerSpellTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesTargetControllerSpellTriggeredAbility(Effect effect, Boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java b/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java
index 51bcf5ce3f1..7f0dcb15fb9 100644
--- a/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BecomesTargetTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author North
  */
-public class BecomesTargetTriggeredAbility extends TriggeredAbilityImpl<BecomesTargetTriggeredAbility> {
+public class BecomesTargetTriggeredAbility extends TriggeredAbilityImpl {
 
     public BecomesTargetTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
index 9844e4b8f16..ac8f150edeb 100644
--- a/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
@@ -8,7 +8,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.target.targetpointer.FixedTarget;
 
-public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl<BeginningOfCombatTriggeredAbility> {
+public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
     
     private TargetController targetController;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java
index 8995c60c423..09480346e10 100644
--- a/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfDrawTriggeredAbility.java
@@ -9,7 +9,7 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
-public class BeginningOfDrawTriggeredAbility extends TriggeredAbilityImpl<BeginningOfDrawTriggeredAbility> {
+public class BeginningOfDrawTriggeredAbility extends TriggeredAbilityImpl {
     private TargetController targetController;
 
     /**
diff --git a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java
index 38acf23e9ba..3e7092a387d 100644
--- a/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfEndStepTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
-public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl<BeginningOfEndStepTriggeredAbility> {
+public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl {
     private TargetController targetController;
     private Condition interveningIfClauseCondition;
 
diff --git a/Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java
index 5833c653535..978f40a82e6 100644
--- a/Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfPreCombatMainTriggeredAbility.java
@@ -17,7 +17,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class BeginningOfPreCombatMainTriggeredAbility extends TriggeredAbilityImpl<BeginningOfPreCombatMainTriggeredAbility> {
+public class BeginningOfPreCombatMainTriggeredAbility extends TriggeredAbilityImpl {
 
     private TargetController targetController;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
index ab2ab442c28..12186fb9a1f 100644
--- a/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfUntapTriggeredAbility.java
@@ -17,7 +17,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author Jeff
  */
-public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl<BeginningOfUntapTriggeredAbility> {
+public class BeginningOfUntapTriggeredAbility extends TriggeredAbilityImpl {
     
     private TargetController targetController;
 
diff --git a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
index f20d21bce67..c96875afb2b 100644
--- a/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
@@ -42,7 +42,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author Loki
  */
 
-public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl<BeginningOfUpkeepTriggeredAbility> {
+public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
     private TargetController targetController;
     private boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java b/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java
index db00b4a76cf..e7d4f19e2c5 100644
--- a/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BeginningOfYourEndStepTriggeredAbility.java
@@ -10,7 +10,7 @@ import mage.game.events.GameEvent;
  * Beginning of controlled end step triggered ability
  * @author Loki
  */
-public class BeginningOfYourEndStepTriggeredAbility extends TriggeredAbilityImpl<BeginningOfYourEndStepTriggeredAbility> {
+public class BeginningOfYourEndStepTriggeredAbility extends TriggeredAbilityImpl {
     public BeginningOfYourEndStepTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
     }
diff --git a/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java
index 01eb08d2301..261d9f69223 100644
--- a/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksAttachedTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.permanent.Permanent;
  *
  * @author garnold
  */
-public class BlocksAttachedTriggeredAbility extends TriggeredAbilityImpl<BlocksAttachedTriggeredAbility>{
+public class BlocksAttachedTriggeredAbility extends TriggeredAbilityImpl{
     private String attachedDescription;
 
     public BlocksAttachedTriggeredAbility(Effect effect, String attachedDescription, boolean optional) {
diff --git a/Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java
index 81de8b246eb..8099aeeace9 100644
--- a/Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksCreatureAttachedTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class BlocksCreatureAttachedTriggeredAbility extends TriggeredAbilityImpl<BlocksCreatureAttachedTriggeredAbility>{
+public class BlocksCreatureAttachedTriggeredAbility extends TriggeredAbilityImpl{
     private boolean setFixedTargetPointer;
     private String attachedDescription;
     private boolean setFixedTargetPointerToBlocked;
diff --git a/Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java
index 3310cbb31ea..829960e0a88 100644
--- a/Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksCreatureTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX2
  */
-public class BlocksCreatureTriggeredAbility extends TriggeredAbilityImpl<BlocksCreatureTriggeredAbility> {
+public class BlocksCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java
index 15a9edb520b..7b6399d83b2 100644
--- a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedByCreatureTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author North
  */
-public class BlocksOrBecomesBlockedByCreatureTriggeredAbility extends TriggeredAbilityImpl<BlocksOrBecomesBlockedByCreatureTriggeredAbility> {
+public class BlocksOrBecomesBlockedByCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     protected String rule;
 
diff --git a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
index 34ecbf05a1d..c6c588bb1d7 100644
--- a/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksOrBecomesBlockedTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author North, Loki
  */
-public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl<BlocksOrBecomesBlockedTriggeredAbility> {
+public class BlocksOrBecomesBlockedTriggeredAbility extends TriggeredAbilityImpl {
 
     public BlocksOrBecomesBlockedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/BlocksTriggeredAbility.java b/Mage/src/mage/abilities/common/BlocksTriggeredAbility.java
index 008aec38c55..d25ad0aa003 100644
--- a/Mage/src/mage/abilities/common/BlocksTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/BlocksTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author North
  */
-public class BlocksTriggeredAbility extends TriggeredAbilityImpl<BlocksTriggeredAbility> {
+public class BlocksTriggeredAbility extends TriggeredAbilityImpl {
 
 //    private boolean fixedTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/CantCounterAbility.java b/Mage/src/mage/abilities/common/CantCounterAbility.java
index bfa059efc0d..bf5bd6d152c 100644
--- a/Mage/src/mage/abilities/common/CantCounterAbility.java
+++ b/Mage/src/mage/abilities/common/CantCounterAbility.java
@@ -36,7 +36,7 @@ import mage.constants.Zone;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CantCounterAbility extends StaticAbility<CantCounterAbility> {
+public class CantCounterAbility extends StaticAbility {
 
     public CantCounterAbility() {
         super(Zone.STACK, new CantCounterSourceEffect());
diff --git a/Mage/src/mage/abilities/common/ChancellorAbility.java b/Mage/src/mage/abilities/common/ChancellorAbility.java
index 0d0db962105..9964ef7d6b7 100644
--- a/Mage/src/mage/abilities/common/ChancellorAbility.java
+++ b/Mage/src/mage/abilities/common/ChancellorAbility.java
@@ -39,7 +39,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ChancellorAbility extends StaticAbility<ChancellorAbility> {
+public class ChancellorAbility extends StaticAbility {
 
     public ChancellorAbility(DelayedTriggeredAbility ability, String text) {
         super(Zone.HAND, new ChancellorEffect(ability, text));
diff --git a/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
index bddc513cfa5..42935afefd7 100644
--- a/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/CreatureEntersBattlefieldTriggeredAbility.java
@@ -43,7 +43,7 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author North
  */
-public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl<CreatureEntersBattlefieldTriggeredAbility> {
+public class CreatureEntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean opponentController;
     protected FilterCreaturePermanent filter = new FilterCreaturePermanent();
diff --git a/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java b/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java
index 309441f23d5..821c9e5c3a9 100644
--- a/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java
+++ b/Mage/src/mage/abilities/common/DamageAsThoughNotBlockedAbility.java
@@ -38,7 +38,7 @@ import mage.constants.Zone;
 /**
  * @author BetaSteward
  */
-public class DamageAsThoughNotBlockedAbility extends StaticAbility<DamageAsThoughNotBlockedAbility> implements MageSingleton {
+public class DamageAsThoughNotBlockedAbility extends StaticAbility implements MageSingleton {
 
     private static final DamageAsThoughNotBlockedAbility fINSTANCE =  new DamageAsThoughNotBlockedAbility();
 
diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java
index 22a9044f5ce..103c8713736 100644
--- a/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsCombatDamageToACreatureTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX
  */
-public class DealsCombatDamageToACreatureTriggeredAbility extends TriggeredAbilityImpl<DealsCombatDamageToACreatureTriggeredAbility> {
+public class DealsCombatDamageToACreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
index f2c4a258070..0ebde356e42 100644
--- a/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbilityImpl<DealsCombatDamageToAPlayerTriggeredAbility> {
+public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbilityImpl {
     private boolean setTargetPointer;
 
     public DealsCombatDamageToAPlayerTriggeredAbility(Effect effect, boolean optional) {
diff --git a/Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
index 45ceb826448..308c0187d11 100644
--- a/Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX
  */
-public class DealsCombatDamageTriggeredAbility extends TriggeredAbilityImpl<DealsCombatDamageTriggeredAbility> {
+public class DealsCombatDamageTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java
index 29f4a453b89..2041c516514 100644
--- a/Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsDamageGainLifeSourceTriggeredAbility.java
@@ -44,7 +44,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class DealsDamageGainLifeSourceTriggeredAbility extends TriggeredAbilityImpl<DealsDamageGainLifeSourceTriggeredAbility> {
+public class DealsDamageGainLifeSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     public DealsDamageGainLifeSourceTriggeredAbility() {
         super(Zone.BATTLEFIELD, new GainThatMuchLifeEffect(), false);
diff --git a/Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
index 3776c13eac7..6be01fef086 100644
--- a/Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsDamageToACreatureAttachedTriggeredAbility.java
@@ -42,7 +42,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX
  */
-public class DealsDamageToACreatureAttachedTriggeredAbility extends TriggeredAbilityImpl<DealsDamageToACreatureAttachedTriggeredAbility> {
+public class DealsDamageToACreatureAttachedTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean combatOnly;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java
index 19793fc712e..3233da91b83 100644
--- a/Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsDamageToACreatureTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX
  */
-public class DealsDamageToACreatureTriggeredAbility extends TriggeredAbilityImpl<DealsDamageToACreatureTriggeredAbility> {
+public class DealsDamageToACreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     private boolean combatOnly;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java
index bdd283def17..f80d39289b0 100644
--- a/Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsDamageToAPlayerAttachedTriggeredAbility.java
@@ -14,7 +14,7 @@ import mage.target.targetpointer.FixedTarget;
 /**
  * @author Loki
  */
-public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbilityImpl<DealsDamageToAPlayerAttachedTriggeredAbility> {
+public class DealsDamageToAPlayerAttachedTriggeredAbility extends TriggeredAbilityImpl {
     private boolean setFixedTargetPointer;
     private String attachedDescription;
     private boolean onlyCombat;
diff --git a/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java b/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java
index b3d55c3ec7f..186b93ecc3e 100644
--- a/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealsDamageToAPlayerTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author jeff
  */
-public class DealsDamageToAPlayerTriggeredAbility extends TriggeredAbilityImpl<DealsDamageToAPlayerTriggeredAbility> {
+public class DealsDamageToAPlayerTriggeredAbility extends TriggeredAbilityImpl {
     private boolean setTargetPointer;
 
     public DealsDamageToAPlayerTriggeredAbility(Effect effect, boolean optional) {
diff --git a/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
index 3b3bb018248..931f2094af7 100644
--- a/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.events.GameEvent;
  * @author LevelX2
  */
 
-public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl<DealtDamageToSourceTriggeredAbility> {
+public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     public DealtDamageToSourceTriggeredAbility(Zone zone, Effect effect, boolean optional) {
         super(zone, effect, optional);
diff --git a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
index 6e7bf5ba0cf..d6b2d6be3d8 100644
--- a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
@@ -10,7 +10,7 @@ import mage.game.events.ZoneChangeEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
-public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbilityImpl<DiesAndDealtDamageThisTurnTriggeredAbility> {
+public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbilityImpl {
 
     public DiesAndDealtDamageThisTurnTriggeredAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
index 9cee95795eb..a13a1a559ef 100644
--- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
@@ -12,7 +12,7 @@ import mage.game.permanent.Permanent;
  * "When enchanted/equipped creature dies" triggered ability
  * @author Loki
  */
-public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl<DiesAttachedTriggeredAbility> {
+public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
     
     private String attachedDescription;
     private boolean diesRuleText;
diff --git a/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java
index 5d469fbe3d9..168f5ed58f4 100644
--- a/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesCreatureTriggeredAbility.java
@@ -14,7 +14,7 @@ import mage.target.targetpointer.FixedTarget;
 /**
  * @author North
  */
-public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl<DiesCreatureTriggeredAbility> {
+public class DiesCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     protected FilterCreaturePermanent filter;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
index 4fe55e69817..cc62c90eb14 100644
--- a/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesThisOrAnotherCreatureTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
 /**
  * @author noxx
  */
-public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityImpl<DiesThisOrAnotherCreatureTriggeredAbility> {
+public class DiesThisOrAnotherCreatureTriggeredAbility extends TriggeredAbilityImpl {
 
     protected FilterCreaturePermanent filter;
 
diff --git a/Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java b/Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java
index 0ea342eaec5..53fee4b7f87 100644
--- a/Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiscardsACardOpponentTriggeredAbility.java
@@ -15,7 +15,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author jeffwadsworth
  */
-public class DiscardsACardOpponentTriggeredAbility extends TriggeredAbilityImpl<DiscardsACardOpponentTriggeredAbility> {
+public class DiscardsACardOpponentTriggeredAbility extends TriggeredAbilityImpl {
 
     public DiscardsACardOpponentTriggeredAbility(Effect effect, Boolean isOptional) {
         super(Zone.BATTLEFIELD, effect, isOptional);
diff --git a/Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java b/Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java
index f421807ad12..d9cb5fdf7fd 100644
--- a/Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DrawCardControllerTriggeredAbility.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent;
  *
  * @author North
  */
-public class DrawCardControllerTriggeredAbility  extends TriggeredAbilityImpl<DrawCardControllerTriggeredAbility> {
+public class DrawCardControllerTriggeredAbility  extends TriggeredAbilityImpl {
 
     public DrawCardControllerTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java b/Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java
index 817c9eb1fe0..dd8ab14b3a6 100644
--- a/Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DrawCardOpponentTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class DrawCardOpponentTriggeredAbility extends TriggeredAbilityImpl<DrawCardOpponentTriggeredAbility> {
+public class DrawCardOpponentTriggeredAbility extends TriggeredAbilityImpl {
 
     boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
index a95888e8581..ddef1593a1c 100644
--- a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
+++ b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
@@ -38,7 +38,7 @@ import mage.abilities.effects.EntersBattlefieldEffect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EntersBattlefieldAbility extends StaticAbility<EntersBattlefieldAbility> {
+public class EntersBattlefieldAbility extends StaticAbility {
 
     protected String abilityRule;
     protected Boolean showRule;
diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java
index d641cab3493..1456e97750e 100644
--- a/Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/EntersBattlefieldOrDiesSourceTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.game.events.ZoneChangeEvent;
  * @author LevelX2
  */
 
-public class EntersBattlefieldOrDiesSourceTriggeredAbility extends TriggeredAbilityImpl<EntersBattlefieldOrDiesSourceTriggeredAbility> {
+public class EntersBattlefieldOrDiesSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     public EntersBattlefieldOrDiesSourceTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
index ec516e2883e..1d8d119f17c 100644
--- a/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
+++ b/Mage/src/mage/abilities/common/EntersBattlefieldTappedAbility.java
@@ -37,7 +37,7 @@ import mage.abilities.effects.common.TapSourceEffect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EntersBattlefieldTappedAbility extends StaticAbility<EntersBattlefieldTappedAbility> {
+public class EntersBattlefieldTappedAbility extends StaticAbility {
 
     private String ruleText;
     
diff --git a/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java
index e0621e1c0d8..a5fc21bbfcb 100644
--- a/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/FetchLandActivatedAbility.java
@@ -49,7 +49,7 @@ import mage.target.common.TargetCardInLibrary;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FetchLandActivatedAbility extends ActivatedAbilityImpl<FetchLandActivatedAbility> {
+public class FetchLandActivatedAbility extends ActivatedAbilityImpl {
 
     public FetchLandActivatedAbility(String[] subtypes) {
         this(true, subtypes);
diff --git a/Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java b/Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java
index fc365bee346..47c59a51dcd 100644
--- a/Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/GainLifeControllerTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class GainLifeControllerTriggeredAbility extends TriggeredAbilityImpl<GainLifeControllerTriggeredAbility> {
+public class GainLifeControllerTriggeredAbility extends TriggeredAbilityImpl {
     private boolean setTargetPointer;
 
     public GainLifeControllerTriggeredAbility(Effect effect, boolean optional) {
diff --git a/Mage/src/mage/abilities/common/LandfallAbility.java b/Mage/src/mage/abilities/common/LandfallAbility.java
index a5ba9c084a1..495f79cedb4 100644
--- a/Mage/src/mage/abilities/common/LandfallAbility.java
+++ b/Mage/src/mage/abilities/common/LandfallAbility.java
@@ -41,7 +41,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LandfallAbility extends TriggeredAbilityImpl<LandfallAbility> {
+public class LandfallAbility extends TriggeredAbilityImpl {
 
     public LandfallAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java b/Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java
index a88eb500428..3eebc965982 100644
--- a/Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/LimitedTimesPerTurnActivatedAbility.java
@@ -40,7 +40,7 @@ import mage.util.CardUtil;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LimitedTimesPerTurnActivatedAbility extends ActivatedAbilityImpl<LimitedTimesPerTurnActivatedAbility> {
+public class LimitedTimesPerTurnActivatedAbility extends ActivatedAbilityImpl {
 
     private int maxActivationsPerTurn;
 
diff --git a/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java b/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java
index 89c1f5d1795..f4386a244e6 100644
--- a/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/OnEventTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class OnEventTriggeredAbility extends TriggeredAbilityImpl<OnEventTriggeredAbility> {
+public class OnEventTriggeredAbility extends TriggeredAbilityImpl {
 
     private EventType eventType;
     private String eventName;
diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java b/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java
index 4c1326732ae..d5ff69d667e 100644
--- a/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/OpponentSacrificesNonTokenPermanentTriggeredAbility.java
@@ -37,7 +37,7 @@ import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 import mage.game.permanent.PermanentToken;
 
-public class OpponentSacrificesNonTokenPermanentTriggeredAbility extends TriggeredAbilityImpl<OpponentSacrificesNonTokenPermanentTriggeredAbility> {
+public class OpponentSacrificesNonTokenPermanentTriggeredAbility extends TriggeredAbilityImpl {
 
     public OpponentSacrificesNonTokenPermanentTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java b/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java
index 1de3fb173f6..4c449efd3b1 100644
--- a/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/OpponentSacrificesPermanentTriggeredAbility.java
@@ -36,7 +36,7 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.target.targetpointer.FixedTarget;
 
-public class OpponentSacrificesPermanentTriggeredAbility extends TriggeredAbilityImpl<OpponentSacrificesPermanentTriggeredAbility> {
+public class OpponentSacrificesPermanentTriggeredAbility extends TriggeredAbilityImpl {
 
     public OpponentSacrificesPermanentTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
diff --git a/Mage/src/mage/abilities/common/PassAbility.java b/Mage/src/mage/abilities/common/PassAbility.java
index fb5080c8c1c..1c64b2a05c9 100644
--- a/Mage/src/mage/abilities/common/PassAbility.java
+++ b/Mage/src/mage/abilities/common/PassAbility.java
@@ -38,7 +38,7 @@ import mage.game.Game;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PassAbility extends ActivatedAbilityImpl<PassAbility> {
+public class PassAbility extends ActivatedAbilityImpl {
 
     public PassAbility() {
         super(Zone.ALL, new PassEffect());
diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
index d8c9e5fdc3e..2f71c700303 100644
--- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldAllTriggeredAbility.java
@@ -42,7 +42,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX2
  */
-public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl<PutIntoGraveFromBattlefieldAllTriggeredAbility> {
+public class PutIntoGraveFromBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
 
     private FilterPermanent filter;
     private boolean setTargetPointer;
diff --git a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java
index b4174a5f1de..100efd54fa9 100644
--- a/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/PutIntoGraveFromBattlefieldTriggeredAbility.java
@@ -11,7 +11,7 @@ import mage.game.permanent.Permanent;
 /**
  * @author nantuko, loki
  */
-public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl<PutIntoGraveFromBattlefieldTriggeredAbility> {
+public class PutIntoGraveFromBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
 
     public PutIntoGraveFromBattlefieldTriggeredAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java b/Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java
index 06d23f3fa74..02ff55bdc98 100644
--- a/Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/SacrificeSourceTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.events.GameEvent;
  * @author LevelX2
  */
 
-public class SacrificeSourceTriggeredAbility extends TriggeredAbilityImpl<SacrificeSourceTriggeredAbility> {
+public class SacrificeSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     public SacrificeSourceTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.ALL, effect, optional);
diff --git a/Mage/src/mage/abilities/common/SimpleActivatedAbility.java b/Mage/src/mage/abilities/common/SimpleActivatedAbility.java
index 62268163f88..f75a79f1fd8 100644
--- a/Mage/src/mage/abilities/common/SimpleActivatedAbility.java
+++ b/Mage/src/mage/abilities/common/SimpleActivatedAbility.java
@@ -39,7 +39,7 @@ import mage.abilities.effects.Effect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SimpleActivatedAbility extends ActivatedAbilityImpl<SimpleActivatedAbility> {
+public class SimpleActivatedAbility extends ActivatedAbilityImpl {
 
     public SimpleActivatedAbility(Zone zone, Effect effect, ManaCosts cost) {
         super(zone, effect, cost);
diff --git a/Mage/src/mage/abilities/common/SimpleEvasionAbility.java b/Mage/src/mage/abilities/common/SimpleEvasionAbility.java
index 3d12ea68dc6..d965cfa540c 100644
--- a/Mage/src/mage/abilities/common/SimpleEvasionAbility.java
+++ b/Mage/src/mage/abilities/common/SimpleEvasionAbility.java
@@ -38,7 +38,7 @@ import mage.constants.Zone;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SimpleEvasionAbility extends EvasionAbility<SimpleEvasionAbility> {
+public class SimpleEvasionAbility extends EvasionAbility {
 
     public SimpleEvasionAbility(Effect effect) {
         super();
diff --git a/Mage/src/mage/abilities/common/SimpleStaticAbility.java b/Mage/src/mage/abilities/common/SimpleStaticAbility.java
index 0b9939fd442..11c4f2597a9 100644
--- a/Mage/src/mage/abilities/common/SimpleStaticAbility.java
+++ b/Mage/src/mage/abilities/common/SimpleStaticAbility.java
@@ -36,7 +36,7 @@ import mage.abilities.effects.Effect;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SimpleStaticAbility extends StaticAbility<SimpleStaticAbility> {
+public class SimpleStaticAbility extends StaticAbility {
 
     public SimpleStaticAbility(Zone zone, Effect effect) {
         super(zone, effect);
diff --git a/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java b/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java
index ce5dfb4130f..45783d638d6 100644
--- a/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/SimpleTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SimpleTriggeredAbility extends TriggeredAbilityImpl<SimpleTriggeredAbility> {
+public class SimpleTriggeredAbility extends TriggeredAbilityImpl {
 
     private EventType eventType;
     private boolean onlyController;
diff --git a/Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java
index 5bed241791e..11a8dc4a6b1 100644
--- a/Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/SpellCastAllTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author LevelX2
  */
-public class SpellCastAllTriggeredAbility extends TriggeredAbilityImpl<SpellCastAllTriggeredAbility> {
+public class SpellCastAllTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell spellCard = new FilterSpell("a spell");
     protected FilterSpell filter;
diff --git a/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java
index 12de19d9f08..703e703f61d 100644
--- a/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/SpellCastControllerTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author North
  */
-public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl<SpellCastControllerTriggeredAbility> {
+public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell spellCard = new FilterSpell("a spell");
     protected FilterSpell filter;
diff --git a/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java
index 9a65cc08548..1e4b8fdd73a 100644
--- a/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/SpellCastOpponentTriggeredAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl<SpellCastOpponentTriggeredAbility> {
+public class SpellCastOpponentTriggeredAbility extends TriggeredAbilityImpl {
 
     private static final FilterSpell spellCard = new FilterSpell("a spell");
     protected FilterSpell filter;
diff --git a/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java b/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java
index 18a98363aaa..1c0bf162b26 100644
--- a/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/TapLandForManaAllTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author Quercitron
  */
-public class TapLandForManaAllTriggeredAbility extends TriggeredAbilityImpl<TapLandForManaAllTriggeredAbility> {
+public class TapLandForManaAllTriggeredAbility extends TriggeredAbilityImpl {
 
     private final boolean setTargetPointer;
 
diff --git a/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java b/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java
index e8b2e9e92ed..bc5518bed88 100644
--- a/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/UnattachedTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author nantuko
  */
-public class UnattachedTriggeredAbility extends TriggeredAbilityImpl<UnattachedTriggeredAbility> {
+public class UnattachedTriggeredAbility extends TriggeredAbilityImpl {
 
     public UnattachedTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
diff --git a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
index 0003cfb4d19..42db0f543d3 100644
--- a/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/ZoneChangeAllTriggeredAbility.java
@@ -43,7 +43,7 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+public class ZoneChangeAllTriggeredAbility<T extends ZoneChangeAllTriggeredAbility<T>> extends TriggeredAbilityImpl {
 
     protected FilterPermanent filter;
     protected Zone fromZone;
diff --git a/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java b/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java
index 67f99dce760..ad6302f2ae4 100644
--- a/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java
@@ -43,7 +43,7 @@ import mage.game.permanent.Permanent;
  * @author BetaSteward_at_googlemail.com
  * @param <T>
  */
-public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>> extends TriggeredAbilityImpl<T> {
+public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>> extends TriggeredAbilityImpl {
 
     protected Zone fromZone;
     protected Zone toZone;
diff --git a/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java
index 07436bb6eaf..9aea59b06cb 100644
--- a/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtEndOfTurnDelayedTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.game.permanent.Permanent;
  *
  * @author North
  */
-public class AtEndOfTurnDelayedTriggeredAbility extends DelayedTriggeredAbility<AtEndOfTurnDelayedTriggeredAbility> {
+public class AtEndOfTurnDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private TargetController targetController;
 
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java
index 37ae7ac0198..a2334ec1f3a 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfCombatDelayedTriggeredAbility.java
@@ -5,7 +5,7 @@ import mage.abilities.effects.Effect;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
-public class AtTheBeginOfCombatDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheBeginOfCombatDelayedTriggeredAbility> {
+public class AtTheBeginOfCombatDelayedTriggeredAbility extends DelayedTriggeredAbility {
     public AtTheBeginOfCombatDelayedTriggeredAbility(Effect effect) {
         super(effect);
     }
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java
index 63aa413e83c..f42ba6996df 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfNextUpkeepDelayedTriggeredAbility.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent;
  * @author LevelX2
  */
 
-public class AtTheBeginOfNextUpkeepDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheBeginOfNextUpkeepDelayedTriggeredAbility> {
+public class AtTheBeginOfNextUpkeepDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public AtTheBeginOfNextUpkeepDelayedTriggeredAbility(Effect effect) {
         this(effect, Duration.Custom);
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainDelayedTriggeredAbility.java
index 75096c30bf7..48710e76468 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfPreCombatMainDelayedTriggeredAbility.java
@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class AtTheBeginOfPreCombatMainDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheBeginOfPreCombatMainDelayedTriggeredAbility> {
+public class AtTheBeginOfPreCombatMainDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     private TargetController targetController;
 
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java
index dbc3ec76ac7..1d34c3df80f 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility.java
@@ -14,7 +14,7 @@ import mage.game.events.GameEvent;
  *
  * @author jeffwadsworth
  */
-public class AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility> {
+public class AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(Effect effect) {
         this(effect, Duration.Custom, true);
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java
index 765ef7d07be..a44aa7d73cf 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheEndOfCombatDelayedTriggeredAbility.java
@@ -5,7 +5,7 @@ import mage.abilities.effects.Effect;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 
-public class AtTheEndOfCombatDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheEndOfCombatDelayedTriggeredAbility> {
+public class AtTheEndOfCombatDelayedTriggeredAbility extends DelayedTriggeredAbility {
     public AtTheEndOfCombatDelayedTriggeredAbility(Effect effect) {
         super(effect);
     }
diff --git a/Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java
index 58ec574717a..a42fcd475d7 100644
--- a/Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/AtTheEndOfTurnStepPostDelayedTriggeredAbility.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent;
 /**
  * @author nantuko
  */
-public class AtTheEndOfTurnStepPostDelayedTriggeredAbility extends DelayedTriggeredAbility<AtTheEndOfTurnStepPostDelayedTriggeredAbility> {
+public class AtTheEndOfTurnStepPostDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public AtTheEndOfTurnStepPostDelayedTriggeredAbility(Effect effect) {
         super(effect);
diff --git a/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java b/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
index 44a6038aca1..4676341c68e 100644
--- a/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/delayed/PactDelayedTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.players.Player;
 /**
  * @author nantuko
  */
-public class PactDelayedTriggeredAbility extends DelayedTriggeredAbility<PactDelayedTriggeredAbility> {
+public class PactDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public PactDelayedTriggeredAbility(ManaCosts cost) {
         super(new PactEffect(cost));
diff --git a/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java b/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java
index d59c7ad2753..2f406e0fceb 100644
--- a/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java
+++ b/Mage/src/mage/abilities/costs/AlternativeCostSourceAbility.java
@@ -44,7 +44,7 @@ import mage.players.Player;
  *
  * @author LevelX2
  */
-public class AlternativeCostSourceAbility extends StaticAbility<AlternativeCostSourceAbility> implements AlternativeSourceCosts {
+public class AlternativeCostSourceAbility extends StaticAbility implements AlternativeSourceCosts {
 
     protected List<AlternativeCost2> alternateCosts = new LinkedList<>();
     protected Condition condition;
diff --git a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java
index 2a2115db565..6b858bcfd2a 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalActivatedAbility.java
@@ -21,7 +21,7 @@ import mage.game.Game;
  *
  * @author LevelX
  */
-public class ConditionalActivatedAbility extends ActivatedAbilityImpl<ConditionalActivatedAbility> {
+public class ConditionalActivatedAbility extends ActivatedAbilityImpl {
 
     private Condition condition;
     private String ruleText = null;
diff --git a/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java b/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java
index 4467cfd9108..f0456f2e11f 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalGainActivatedAbility.java
@@ -45,7 +45,7 @@ import mage.game.Game;
  *
  * @author LevelX
  */
-public class ConditionalGainActivatedAbility extends ActivatedAbilityImpl<ConditionalGainActivatedAbility> {
+public class ConditionalGainActivatedAbility extends ActivatedAbilityImpl {
 
         private Condition condition;
         private String staticText = "";
diff --git a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
index e5adced28e1..e38a29fcad0 100644
--- a/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
+++ b/Mage/src/mage/abilities/decorator/ConditionalTriggeredAbility.java
@@ -12,7 +12,7 @@ import mage.game.events.GameEvent;
  *
  * @author nantuko
  */
-public class ConditionalTriggeredAbility extends TriggeredAbilityImpl<ConditionalTriggeredAbility> {
+public class ConditionalTriggeredAbility extends TriggeredAbilityImpl {
 
     protected TriggeredAbility ability;
     protected Condition condition;
diff --git a/Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java b/Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java
index 57c2fad1355..78ce2094503 100644
--- a/Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java
+++ b/Mage/src/mage/abilities/effects/common/CastSourceTriggeredAbility.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent;
  *
  * @author Plopman
  */
-public class CastSourceTriggeredAbility extends TriggeredAbilityImpl<CastSourceTriggeredAbility> {
+public class CastSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     public CastSourceTriggeredAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/effects/common/DealsDamageToOpponentTriggeredAbility.java b/Mage/src/mage/abilities/effects/common/DealsDamageToOpponentTriggeredAbility.java
index 10718033198..b168eee9268 100644
--- a/Mage/src/mage/abilities/effects/common/DealsDamageToOpponentTriggeredAbility.java
+++ b/Mage/src/mage/abilities/effects/common/DealsDamageToOpponentTriggeredAbility.java
@@ -39,7 +39,7 @@ import mage.target.targetpointer.FixedTarget;
 /**
  * @author noxx
  */
-public class DealsDamageToOpponentTriggeredAbility extends TriggeredAbilityImpl<DealsDamageToOpponentTriggeredAbility> {
+public class DealsDamageToOpponentTriggeredAbility extends TriggeredAbilityImpl {
 
     boolean onlyCombat;
 
diff --git a/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java b/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java
index f939d472d9e..7e2f6540cb1 100644
--- a/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java
+++ b/Mage/src/mage/abilities/keyword/AnnihilatorAbility.java
@@ -55,7 +55,7 @@ import java.util.UUID;
  *
  * @author maurer.it_at_gmail.com
  */
-public class AnnihilatorAbility extends TriggeredAbilityImpl<AnnihilatorAbility> {
+public class AnnihilatorAbility extends TriggeredAbilityImpl {
 
     int count;
 
diff --git a/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java b/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java
index 81d955dfdab..2186846bc9b 100644
--- a/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java
+++ b/Mage/src/mage/abilities/keyword/AttacksThisTurnMarkerAbility.java
@@ -40,7 +40,7 @@ import java.io.ObjectStreamException;
  *
  * @author magenoxx_at_googlemail.com
  */
-public class AttacksThisTurnMarkerAbility extends StaticAbility<AttacksThisTurnMarkerAbility> implements MageSingleton {
+public class AttacksThisTurnMarkerAbility extends StaticAbility implements MageSingleton {
 
     private static final AttacksThisTurnMarkerAbility fINSTANCE =  new AttacksThisTurnMarkerAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/BattalionAbility.java b/Mage/src/mage/abilities/keyword/BattalionAbility.java
index 3d2859a296f..093239e5242 100644
--- a/Mage/src/mage/abilities/keyword/BattalionAbility.java
+++ b/Mage/src/mage/abilities/keyword/BattalionAbility.java
@@ -45,7 +45,7 @@ import mage.game.events.GameEvent;
  */
 
 
-public class BattalionAbility extends TriggeredAbilityImpl<BattalionAbility> {
+public class BattalionAbility extends TriggeredAbilityImpl {
 
     public BattalionAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
diff --git a/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java b/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java
index dc822ab4fa2..14367db0631 100644
--- a/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java
+++ b/Mage/src/mage/abilities/keyword/BlocksThisTurnMarkerAbility.java
@@ -40,7 +40,7 @@ import java.io.ObjectStreamException;
  *
  * @author magenoxx_at_googlemail.com
  */
-public class BlocksThisTurnMarkerAbility extends StaticAbility<BlocksThisTurnMarkerAbility> implements MageSingleton {
+public class BlocksThisTurnMarkerAbility extends StaticAbility implements MageSingleton {
 
     private static final BlocksThisTurnMarkerAbility fINSTANCE =  new BlocksThisTurnMarkerAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/BloodrushAbility.java b/Mage/src/mage/abilities/keyword/BloodrushAbility.java
index e56530c81ab..06c3f9537e4 100644
--- a/Mage/src/mage/abilities/keyword/BloodrushAbility.java
+++ b/Mage/src/mage/abilities/keyword/BloodrushAbility.java
@@ -46,7 +46,7 @@ import mage.target.common.TargetAttackingCreature;
  */
 
 
-public class BloodrushAbility extends ActivatedAbilityImpl<BloodrushAbility> {
+public class BloodrushAbility extends ActivatedAbilityImpl {
 
     public BloodrushAbility(String manaString, Effect effect) {
         super(Zone.HAND, effect, new ManaCostsImpl(manaString));
diff --git a/Mage/src/mage/abilities/keyword/BuybackAbility.java b/Mage/src/mage/abilities/keyword/BuybackAbility.java
index 3986d589527..c832270cd4a 100644
--- a/Mage/src/mage/abilities/keyword/BuybackAbility.java
+++ b/Mage/src/mage/abilities/keyword/BuybackAbility.java
@@ -61,7 +61,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class BuybackAbility extends StaticAbility<BuybackAbility> implements OptionalAdditionalSourceCosts {
+public class BuybackAbility extends StaticAbility implements OptionalAdditionalSourceCosts {
 
     private static final String keywordText = "Buyback";
     private static final String reminderTextCost = "<i>(You may {cost} in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.)</i>";
diff --git a/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java b/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java
index c8bc10eecf8..55aa82e3905 100644
--- a/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java
+++ b/Mage/src/mage/abilities/keyword/CanAttackOnlyAloneAbility.java
@@ -36,7 +36,7 @@ import mage.abilities.StaticAbility;
 /**
  * @author LevelX2
  */
-public class CanAttackOnlyAloneAbility extends StaticAbility<CanAttackOnlyAloneAbility> implements MageSingleton {
+public class CanAttackOnlyAloneAbility extends StaticAbility implements MageSingleton {
 
     private static final CanAttackOnlyAloneAbility fINSTANCE = new CanAttackOnlyAloneAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java b/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java
index 7f075834dfb..a7b0d7ef72d 100644
--- a/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java
+++ b/Mage/src/mage/abilities/keyword/CantAttackAloneAbility.java
@@ -37,7 +37,7 @@ import java.io.ObjectStreamException;
 /**
  * @author magenoxx_at_googlemail.com
  */
-public class CantAttackAloneAbility extends StaticAbility<CantAttackAloneAbility> implements MageSingleton {
+public class CantAttackAloneAbility extends StaticAbility implements MageSingleton {
 
     private static final CantAttackAloneAbility fINSTANCE = new CantAttackAloneAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java b/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java
index 1ac85f4b6aa..8b4b316e36c 100644
--- a/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java
+++ b/Mage/src/mage/abilities/keyword/CantBlockAloneAbility.java
@@ -37,7 +37,7 @@ import java.io.ObjectStreamException;
 /**
  * @author magenoxx_at_googlemail.com
  */
-public class CantBlockAloneAbility extends StaticAbility<CantBlockAloneAbility> implements MageSingleton {
+public class CantBlockAloneAbility extends StaticAbility implements MageSingleton {
 
     private static final CantBlockAloneAbility fINSTANCE = new CantBlockAloneAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/CascadeAbility.java b/Mage/src/mage/abilities/keyword/CascadeAbility.java
index 491f3e75c2c..52f0cbee6fb 100644
--- a/Mage/src/mage/abilities/keyword/CascadeAbility.java
+++ b/Mage/src/mage/abilities/keyword/CascadeAbility.java
@@ -46,7 +46,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CascadeAbility extends TriggeredAbilityImpl<CascadeAbility> {
+public class CascadeAbility extends TriggeredAbilityImpl {
     //20091005 - 702.82
 
     private boolean withReminder;
diff --git a/Mage/src/mage/abilities/keyword/ChampionAbility.java b/Mage/src/mage/abilities/keyword/ChampionAbility.java
index f597dd0260a..48fca78b0c4 100644
--- a/Mage/src/mage/abilities/keyword/ChampionAbility.java
+++ b/Mage/src/mage/abilities/keyword/ChampionAbility.java
@@ -68,7 +68,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
  *
  */
 
-public class ChampionAbility extends StaticAbility<ChampionAbility> {
+public class ChampionAbility extends StaticAbility {
 
     protected String[] subtypes;
     protected String objectDescription;
diff --git a/Mage/src/mage/abilities/keyword/ChangelingAbility.java b/Mage/src/mage/abilities/keyword/ChangelingAbility.java
index 08fe0c9488a..f36020d1bf6 100644
--- a/Mage/src/mage/abilities/keyword/ChangelingAbility.java
+++ b/Mage/src/mage/abilities/keyword/ChangelingAbility.java
@@ -43,7 +43,7 @@ import mage.abilities.StaticAbility;
  *
  * @author nantuko
  */
-public class ChangelingAbility extends StaticAbility<ChangelingAbility> implements MageSingleton {
+public class ChangelingAbility extends StaticAbility implements MageSingleton {
     public static final String ALL_CREATURE_TYPE = "All Creature Type";
     private static final ChangelingAbility fINSTANCE =  new ChangelingAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/ChannelAbility.java b/Mage/src/mage/abilities/keyword/ChannelAbility.java
index 4b4e83b4d16..71aa14c697e 100644
--- a/Mage/src/mage/abilities/keyword/ChannelAbility.java
+++ b/Mage/src/mage/abilities/keyword/ChannelAbility.java
@@ -37,7 +37,7 @@ import mage.constants.TimingRule;
 
 
 
-public class ChannelAbility extends ActivatedAbilityImpl<ChannelAbility> {
+public class ChannelAbility extends ActivatedAbilityImpl {
 
     public ChannelAbility(String manaString, Effect effect) {
         this(manaString, effect, TimingRule.INSTANT);
diff --git a/Mage/src/mage/abilities/keyword/CyclingAbility.java b/Mage/src/mage/abilities/keyword/CyclingAbility.java
index 85d53b4d865..27dcf0418ab 100644
--- a/Mage/src/mage/abilities/keyword/CyclingAbility.java
+++ b/Mage/src/mage/abilities/keyword/CyclingAbility.java
@@ -43,7 +43,7 @@ import mage.target.common.TargetCardInLibrary;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CyclingAbility extends ActivatedAbilityImpl<CyclingAbility> {
+public class CyclingAbility extends ActivatedAbilityImpl {
 
     private final Cost cost;
     private final String text;
diff --git a/Mage/src/mage/abilities/keyword/DeathtouchAbility.java b/Mage/src/mage/abilities/keyword/DeathtouchAbility.java
index 8e572e28362..2fbebd90256 100644
--- a/Mage/src/mage/abilities/keyword/DeathtouchAbility.java
+++ b/Mage/src/mage/abilities/keyword/DeathtouchAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DeathtouchAbility extends StaticAbility<DeathtouchAbility> implements MageSingleton {
+public class DeathtouchAbility extends StaticAbility implements MageSingleton {
 
     private static final DeathtouchAbility fINSTANCE =  new DeathtouchAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/DefenderAbility.java b/Mage/src/mage/abilities/keyword/DefenderAbility.java
index 9619061e143..88f9dc8d930 100644
--- a/Mage/src/mage/abilities/keyword/DefenderAbility.java
+++ b/Mage/src/mage/abilities/keyword/DefenderAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DefenderAbility extends StaticAbility<DefenderAbility> implements MageSingleton {
+public class DefenderAbility extends StaticAbility implements MageSingleton {
 
     private static final DefenderAbility fINSTANCE =  new DefenderAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java b/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java
index 40549b25d91..f1988843f67 100644
--- a/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java
+++ b/Mage/src/mage/abilities/keyword/DoubleStrikeAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DoubleStrikeAbility extends StaticAbility<DoubleStrikeAbility> implements MageSingleton {
+public class DoubleStrikeAbility extends StaticAbility implements MageSingleton {
 
     private static final DoubleStrikeAbility fINSTANCE =  new DoubleStrikeAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/EchoAbility.java b/Mage/src/mage/abilities/keyword/EchoAbility.java
index d8ed1b85b78..45db7e74079 100644
--- a/Mage/src/mage/abilities/keyword/EchoAbility.java
+++ b/Mage/src/mage/abilities/keyword/EchoAbility.java
@@ -49,7 +49,7 @@ import mage.players.Player;
  *
  * @author Backfir3
  */
-public class EchoAbility extends TriggeredAbilityImpl<EchoAbility> {
+public class EchoAbility extends TriggeredAbilityImpl {
 
     protected UUID lastController;
     protected boolean echoPaid;
diff --git a/Mage/src/mage/abilities/keyword/EnchantAbility.java b/Mage/src/mage/abilities/keyword/EnchantAbility.java
index 3aa929ff920..fed3f32a41b 100644
--- a/Mage/src/mage/abilities/keyword/EnchantAbility.java
+++ b/Mage/src/mage/abilities/keyword/EnchantAbility.java
@@ -35,7 +35,7 @@ import mage.abilities.StaticAbility;
  * @author BetaSteward_at_googlemail.com
  * @author North
  */
-public class EnchantAbility extends StaticAbility<EnchantAbility> {
+public class EnchantAbility extends StaticAbility {
 
     protected String targetName;
 
diff --git a/Mage/src/mage/abilities/keyword/EntwineAbility.java b/Mage/src/mage/abilities/keyword/EntwineAbility.java
index 8e755cebded..475324cae6a 100644
--- a/Mage/src/mage/abilities/keyword/EntwineAbility.java
+++ b/Mage/src/mage/abilities/keyword/EntwineAbility.java
@@ -58,7 +58,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class EntwineAbility extends StaticAbility<EntwineAbility> implements OptionalAdditionalModeSourceCosts {
+public class EntwineAbility extends StaticAbility implements OptionalAdditionalModeSourceCosts {
 
     private static final String keywordText = "Entwine";
     private static final String reminderText = "<i> (Choose both if you pay the entwine cost.)</i>";
diff --git a/Mage/src/mage/abilities/keyword/EquipAbility.java b/Mage/src/mage/abilities/keyword/EquipAbility.java
index 4659e96169f..cde5b484f6f 100644
--- a/Mage/src/mage/abilities/keyword/EquipAbility.java
+++ b/Mage/src/mage/abilities/keyword/EquipAbility.java
@@ -43,7 +43,7 @@ import mage.target.common.TargetControlledCreaturePermanent;
 /**
  * @author BetaSteward_at_googlemail.com
  */
-public class EquipAbility extends ActivatedAbilityImpl<EquipAbility> {
+public class EquipAbility extends ActivatedAbilityImpl {
 
     public EquipAbility(Outcome outcome, Cost cost) {
         this(outcome, cost, new TargetControlledCreaturePermanent(true));
diff --git a/Mage/src/mage/abilities/keyword/EvokeAbility.java b/Mage/src/mage/abilities/keyword/EvokeAbility.java
index b1854e0d93f..e2543f62599 100644
--- a/Mage/src/mage/abilities/keyword/EvokeAbility.java
+++ b/Mage/src/mage/abilities/keyword/EvokeAbility.java
@@ -55,7 +55,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class EvokeAbility extends StaticAbility<EvokeAbility> implements AlternativeSourceCosts {
+public class EvokeAbility extends StaticAbility implements AlternativeSourceCosts {
 
     protected static final String EVOKE_KEYWORD = "Evoke";
     protected static final String REMINDER_TEXT = "(You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)";
diff --git a/Mage/src/mage/abilities/keyword/EvolveAbility.java b/Mage/src/mage/abilities/keyword/EvolveAbility.java
index 5265a9f9ed7..b32ebbc7d71 100644
--- a/Mage/src/mage/abilities/keyword/EvolveAbility.java
+++ b/Mage/src/mage/abilities/keyword/EvolveAbility.java
@@ -84,7 +84,7 @@ import mage.target.targetpointer.FixedTarget;
  */
 
 
-public class EvolveAbility extends TriggeredAbilityImpl<EvolveAbility> {
+public class EvolveAbility extends TriggeredAbilityImpl {
 
     public EvolveAbility() {
         super(Zone.BATTLEFIELD, new EvolveEffect());
diff --git a/Mage/src/mage/abilities/keyword/ExaltedAbility.java b/Mage/src/mage/abilities/keyword/ExaltedAbility.java
index 5cc7d7ad930..5ab82db8dc8 100644
--- a/Mage/src/mage/abilities/keyword/ExaltedAbility.java
+++ b/Mage/src/mage/abilities/keyword/ExaltedAbility.java
@@ -41,7 +41,7 @@ import mage.target.targetpointer.FixedTarget;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ExaltedAbility extends TriggeredAbilityImpl<ExaltedAbility> {
+public class ExaltedAbility extends TriggeredAbilityImpl {
 
     public ExaltedAbility() {
         super(Zone.BATTLEFIELD, new BoostTargetEffect(1, 1, Duration.EndOfTurn));
diff --git a/Mage/src/mage/abilities/keyword/ExtortAbility.java b/Mage/src/mage/abilities/keyword/ExtortAbility.java
index 7182cecce62..8fdcba8eedf 100644
--- a/Mage/src/mage/abilities/keyword/ExtortAbility.java
+++ b/Mage/src/mage/abilities/keyword/ExtortAbility.java
@@ -55,7 +55,7 @@ import mage.players.Player;
  *
  * @author LevelX2
  */
-public class ExtortAbility extends TriggeredAbilityImpl<ExtortAbility> {
+public class ExtortAbility extends TriggeredAbilityImpl {
 
     public ExtortAbility() {
         super(Zone.BATTLEFIELD, new ExtortEffect(), false);
diff --git a/Mage/src/mage/abilities/keyword/FearAbility.java b/Mage/src/mage/abilities/keyword/FearAbility.java
index 041d7c6d0eb..2f0199b1128 100644
--- a/Mage/src/mage/abilities/keyword/FearAbility.java
+++ b/Mage/src/mage/abilities/keyword/FearAbility.java
@@ -43,7 +43,7 @@ import java.io.ObjectStreamException;
  *
  * @author Loki
  */
-public class FearAbility extends EvasionAbility<FearAbility> implements MageSingleton {
+public class FearAbility extends EvasionAbility implements MageSingleton {
 
     private static final FearAbility fINSTANCE =  new FearAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java b/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java
index 267c0731fe8..7ef603879a6 100644
--- a/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java
+++ b/Mage/src/mage/abilities/keyword/FirstStrikeAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FirstStrikeAbility extends StaticAbility<FirstStrikeAbility> implements MageSingleton {
+public class FirstStrikeAbility extends StaticAbility implements MageSingleton {
 
     private static final FirstStrikeAbility fINSTANCE =  new FirstStrikeAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/FlankingAbility.java b/Mage/src/mage/abilities/keyword/FlankingAbility.java
index 025d64dcf49..14bcdc54ae5 100644
--- a/Mage/src/mage/abilities/keyword/FlankingAbility.java
+++ b/Mage/src/mage/abilities/keyword/FlankingAbility.java
@@ -19,7 +19,7 @@ import mage.target.targetpointer.FixedTarget;
  */
 
 
-public class FlankingAbility extends TriggeredAbilityImpl<FlankingAbility> {
+public class FlankingAbility extends TriggeredAbilityImpl {
 
     public FlankingAbility() {
         super(Zone.BATTLEFIELD, new BoostTargetEffect(-1, -1, Duration.EndOfTurn), false);
diff --git a/Mage/src/mage/abilities/keyword/FlashAbility.java b/Mage/src/mage/abilities/keyword/FlashAbility.java
index 614c4622eee..41f89de06a3 100644
--- a/Mage/src/mage/abilities/keyword/FlashAbility.java
+++ b/Mage/src/mage/abilities/keyword/FlashAbility.java
@@ -37,7 +37,7 @@ import mage.constants.Zone;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FlashAbility extends StaticAbility<FlashAbility> implements MageSingleton {
+public class FlashAbility extends StaticAbility implements MageSingleton {
 
     private static final FlashAbility fINSTANCE =  new FlashAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/FlashbackAbility.java b/Mage/src/mage/abilities/keyword/FlashbackAbility.java
index fb6b4c59577..43a5f98bcaf 100644
--- a/Mage/src/mage/abilities/keyword/FlashbackAbility.java
+++ b/Mage/src/mage/abilities/keyword/FlashbackAbility.java
@@ -206,7 +206,7 @@ class FlashbackEffect extends OneShotEffect<FlashbackEffect> {
     }
 }
 
-class FlashbackTriggeredAbility extends DelayedTriggeredAbility<FlashbackTriggeredAbility> {
+class FlashbackTriggeredAbility extends DelayedTriggeredAbility {
 
     public FlashbackTriggeredAbility() {
         super(new ExileSourceEffect());
diff --git a/Mage/src/mage/abilities/keyword/FlyingAbility.java b/Mage/src/mage/abilities/keyword/FlyingAbility.java
index b3410d1cd81..bfb2a1e137c 100644
--- a/Mage/src/mage/abilities/keyword/FlyingAbility.java
+++ b/Mage/src/mage/abilities/keyword/FlyingAbility.java
@@ -42,7 +42,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FlyingAbility extends EvasionAbility<FlyingAbility> implements MageSingleton {
+public class FlyingAbility extends EvasionAbility implements MageSingleton {
 
     private static final FlyingAbility fINSTANCE =  new FlyingAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/FortifyAbility.java b/Mage/src/mage/abilities/keyword/FortifyAbility.java
index 3b6490ec2bf..077296bd2cf 100644
--- a/Mage/src/mage/abilities/keyword/FortifyAbility.java
+++ b/Mage/src/mage/abilities/keyword/FortifyAbility.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetLandPermanent;
  */
 
 //20091005 - 702.64
-public class FortifyAbility extends ActivatedAbilityImpl<FortifyAbility> {
+public class FortifyAbility extends ActivatedAbilityImpl {
 
     private static final FilterLandPermanent filter = new FilterLandPermanent("land you control");
 
diff --git a/Mage/src/mage/abilities/keyword/GraftAbility.java b/Mage/src/mage/abilities/keyword/GraftAbility.java
index 801eea2c1b3..4beb3555760 100644
--- a/Mage/src/mage/abilities/keyword/GraftAbility.java
+++ b/Mage/src/mage/abilities/keyword/GraftAbility.java
@@ -117,7 +117,7 @@ public class GraftAbility extends TriggeredAbilityImpl {
 
 }
 
-class GraftStaticAbility extends StaticAbility<GraftStaticAbility> {
+class GraftStaticAbility extends StaticAbility {
 
     private String ruleText;
 
diff --git a/Mage/src/mage/abilities/keyword/HasteAbility.java b/Mage/src/mage/abilities/keyword/HasteAbility.java
index 90cbe0d5b86..5fa8d6e89d0 100644
--- a/Mage/src/mage/abilities/keyword/HasteAbility.java
+++ b/Mage/src/mage/abilities/keyword/HasteAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class HasteAbility extends StaticAbility<HasteAbility> implements MageSingleton {
+public class HasteAbility extends StaticAbility implements MageSingleton {
 
     private static final HasteAbility fINSTANCE =  new HasteAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/HauntAbility.java b/Mage/src/mage/abilities/keyword/HauntAbility.java
index 8314e4b8d8d..970705b0bcc 100644
--- a/Mage/src/mage/abilities/keyword/HauntAbility.java
+++ b/Mage/src/mage/abilities/keyword/HauntAbility.java
@@ -61,7 +61,7 @@ import mage.target.targetpointer.FixedTarget;
  * @author LevelX2
  */
 
-public class HauntAbility extends TriggeredAbilityImpl<HauntAbility> {
+public class HauntAbility extends TriggeredAbilityImpl {
 
     private boolean usedFromExile = false;
 
diff --git a/Mage/src/mage/abilities/keyword/HeroicAbility.java b/Mage/src/mage/abilities/keyword/HeroicAbility.java
index 22be29aa7c7..a1b0a3ea30c 100644
--- a/Mage/src/mage/abilities/keyword/HeroicAbility.java
+++ b/Mage/src/mage/abilities/keyword/HeroicAbility.java
@@ -45,7 +45,7 @@ import mage.target.Target;
  * @author LevelX2
  */
 
-public class HeroicAbility extends TriggeredAbilityImpl<HeroicAbility> {
+public class HeroicAbility extends TriggeredAbilityImpl {
 
     public HeroicAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/keyword/HideawayAbility.java b/Mage/src/mage/abilities/keyword/HideawayAbility.java
index 27698060ca1..9ab75d20acc 100644
--- a/Mage/src/mage/abilities/keyword/HideawayAbility.java
+++ b/Mage/src/mage/abilities/keyword/HideawayAbility.java
@@ -62,7 +62,7 @@ import mage.util.CardUtil;
  * controlled the permanent that exiled this card may look at this card in the
  * exile zone.'"
  */
-public class HideawayAbility extends StaticAbility<HideawayAbility> {
+public class HideawayAbility extends StaticAbility {
 
     public HideawayAbility(Card card) {
         super(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new TapSourceEffect(true)));
diff --git a/Mage/src/mage/abilities/keyword/HorsemanshipAbility.java b/Mage/src/mage/abilities/keyword/HorsemanshipAbility.java
index 41541231129..ee03de0d289 100644
--- a/Mage/src/mage/abilities/keyword/HorsemanshipAbility.java
+++ b/Mage/src/mage/abilities/keyword/HorsemanshipAbility.java
@@ -42,7 +42,7 @@ import mage.game.permanent.Permanent;
  * @author LevelX2
  */
 
-public class HorsemanshipAbility extends EvasionAbility<HorsemanshipAbility> implements MageSingleton {
+public class HorsemanshipAbility extends EvasionAbility implements MageSingleton {
     private static final HorsemanshipAbility fINSTANCE =  new HorsemanshipAbility();
 
     private Object readResolve() throws ObjectStreamException {
diff --git a/Mage/src/mage/abilities/keyword/IndestructibleAbility.java b/Mage/src/mage/abilities/keyword/IndestructibleAbility.java
index 130e3950717..9ead675367b 100644
--- a/Mage/src/mage/abilities/keyword/IndestructibleAbility.java
+++ b/Mage/src/mage/abilities/keyword/IndestructibleAbility.java
@@ -52,7 +52,7 @@ import mage.abilities.StaticAbility;
  * @author BetaSteward_at_googlemail.com
  */
 
-public class IndestructibleAbility extends StaticAbility<IndestructibleAbility> {
+public class IndestructibleAbility extends StaticAbility {
 
     private static final IndestructibleAbility fINSTANCE;
 
diff --git a/Mage/src/mage/abilities/keyword/InfectAbility.java b/Mage/src/mage/abilities/keyword/InfectAbility.java
index 05db0001047..438f48471db 100644
--- a/Mage/src/mage/abilities/keyword/InfectAbility.java
+++ b/Mage/src/mage/abilities/keyword/InfectAbility.java
@@ -57,7 +57,7 @@ import java.io.ObjectStreamException;
  *
  *  @author nantuko
  */
-public class InfectAbility extends StaticAbility<InfectAbility> implements MageSingleton {
+public class InfectAbility extends StaticAbility implements MageSingleton {
 
     private static final InfectAbility fINSTANCE =  new InfectAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/InspiredAbility.java b/Mage/src/mage/abilities/keyword/InspiredAbility.java
index c5503c99278..d9a8fa8f9d7 100644
--- a/Mage/src/mage/abilities/keyword/InspiredAbility.java
+++ b/Mage/src/mage/abilities/keyword/InspiredAbility.java
@@ -41,7 +41,7 @@ import mage.game.events.GameEvent;
  * @author LevelX2
  */
 
-public class InspiredAbility extends TriggeredAbilityImpl<InspiredAbility> {
+public class InspiredAbility extends TriggeredAbilityImpl {
 
     public InspiredAbility(Effect effect) {
         this(effect, false);
diff --git a/Mage/src/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/mage/abilities/keyword/IntimidateAbility.java
index d6c9fed674e..54d2c637166 100644
--- a/Mage/src/mage/abilities/keyword/IntimidateAbility.java
+++ b/Mage/src/mage/abilities/keyword/IntimidateAbility.java
@@ -22,7 +22,7 @@ import mage.game.permanent.Permanent;
  *
  *
  */
-public class IntimidateAbility extends EvasionAbility<IntimidateAbility> implements MageSingleton  {
+public class IntimidateAbility extends EvasionAbility implements MageSingleton  {
     private static final IntimidateAbility fInstance = new IntimidateAbility();
 
     public static IntimidateAbility getInstance() {
diff --git a/Mage/src/mage/abilities/keyword/KickerAbility.java b/Mage/src/mage/abilities/keyword/KickerAbility.java
index 84b4a26d4d0..b5d96bb6d22 100644
--- a/Mage/src/mage/abilities/keyword/KickerAbility.java
+++ b/Mage/src/mage/abilities/keyword/KickerAbility.java
@@ -81,7 +81,7 @@ import mage.players.Player;
  * @author LevelX2
  *
  */
-public class KickerAbility extends StaticAbility<KickerAbility> implements OptionalAdditionalSourceCosts {
+public class KickerAbility extends StaticAbility implements OptionalAdditionalSourceCosts {
 
     protected static final String KICKER_KEYWORD = "Kicker";
     protected static final String KICKER_REMINDER_MANA = "(You may pay an additional {cost} as you cast this spell.)";
diff --git a/Mage/src/mage/abilities/keyword/LandwalkAbility.java b/Mage/src/mage/abilities/keyword/LandwalkAbility.java
index 96061ec5f55..a89ea3107f5 100644
--- a/Mage/src/mage/abilities/keyword/LandwalkAbility.java
+++ b/Mage/src/mage/abilities/keyword/LandwalkAbility.java
@@ -40,7 +40,7 @@ import mage.game.permanent.Permanent;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LandwalkAbility extends EvasionAbility<LandwalkAbility> {
+public class LandwalkAbility extends EvasionAbility {
 
     public LandwalkAbility(FilterLandPermanent filter) {
         this.addEffect(new LandwalkEffect(filter));
diff --git a/Mage/src/mage/abilities/keyword/LevelUpAbility.java b/Mage/src/mage/abilities/keyword/LevelUpAbility.java
index be3ee6bc569..750a4a81f4d 100644
--- a/Mage/src/mage/abilities/keyword/LevelUpAbility.java
+++ b/Mage/src/mage/abilities/keyword/LevelUpAbility.java
@@ -39,7 +39,7 @@ import mage.counters.CounterType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LevelUpAbility extends ActivatedAbilityImpl<LevelUpAbility> {
+public class LevelUpAbility extends ActivatedAbilityImpl {
 
     public LevelUpAbility(ManaCosts costs) {
         super(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.LEVEL.createInstance()), costs);
diff --git a/Mage/src/mage/abilities/keyword/LeylineAbility.java b/Mage/src/mage/abilities/keyword/LeylineAbility.java
index 7453b93775a..3ac4e6a00e7 100644
--- a/Mage/src/mage/abilities/keyword/LeylineAbility.java
+++ b/Mage/src/mage/abilities/keyword/LeylineAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LeylineAbility extends StaticAbility<LeylineAbility> implements MageSingleton {
+public class LeylineAbility extends StaticAbility implements MageSingleton {
 
     private static final LeylineAbility fINSTANCE =  new LeylineAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/LifelinkAbility.java b/Mage/src/mage/abilities/keyword/LifelinkAbility.java
index 1a32d24c9be..8378973caff 100644
--- a/Mage/src/mage/abilities/keyword/LifelinkAbility.java
+++ b/Mage/src/mage/abilities/keyword/LifelinkAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class LifelinkAbility extends StaticAbility<LifelinkAbility> implements MageSingleton {
+public class LifelinkAbility extends StaticAbility implements MageSingleton {
 
     private static final LifelinkAbility fINSTANCE =  new LifelinkAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/MadnessAbility.java b/Mage/src/mage/abilities/keyword/MadnessAbility.java
index 3ce22291402..df326cec274 100644
--- a/Mage/src/mage/abilities/keyword/MadnessAbility.java
+++ b/Mage/src/mage/abilities/keyword/MadnessAbility.java
@@ -35,7 +35,7 @@ import java.util.UUID;
  *
  * @author magenoxx_at_gmail.com
  */
-public class MadnessAbility extends StaticAbility<MadnessAbility> {
+public class MadnessAbility extends StaticAbility {
 
     private Cost madnessCost;
     
@@ -132,7 +132,7 @@ class MadnessPlayEffect extends AsThoughEffectImpl<MadnessPlayEffect> {
  * It also marks it with "madness" mark storing unique value to game state
  * that will be used to check that card can be cast from exile zone.
  */
-class MadnessTriggeredAbility extends TriggeredAbilityImpl<MadnessTriggeredAbility> {
+class MadnessTriggeredAbility extends TriggeredAbilityImpl {
 
     MadnessTriggeredAbility() {
         super(Zone.GRAVEYARD, new MadnessExileEffect(), true);
diff --git a/Mage/src/mage/abilities/keyword/MiracleAbility.java b/Mage/src/mage/abilities/keyword/MiracleAbility.java
index fe2e658edeb..0181d23f33a 100644
--- a/Mage/src/mage/abilities/keyword/MiracleAbility.java
+++ b/Mage/src/mage/abilities/keyword/MiracleAbility.java
@@ -51,7 +51,7 @@ import mage.abilities.costs.Cost;
  *
  * @author noxx
  */
-public class MiracleAbility extends StaticAbility<MiracleAbility> {
+public class MiracleAbility extends StaticAbility {
 
     private static final String staticRule = " (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)";
 
diff --git a/Mage/src/mage/abilities/keyword/ModularAbility.java b/Mage/src/mage/abilities/keyword/ModularAbility.java
index 8ba96990f21..59e51e93656 100644
--- a/Mage/src/mage/abilities/keyword/ModularAbility.java
+++ b/Mage/src/mage/abilities/keyword/ModularAbility.java
@@ -104,7 +104,7 @@ public class ModularAbility extends DiesTriggeredAbility {
 
 }
 
-class ModularStaticAbility extends StaticAbility<ModularStaticAbility> {
+class ModularStaticAbility extends StaticAbility {
 
     private String ruleText;
 
diff --git a/Mage/src/mage/abilities/keyword/MonstrosityAbility.java b/Mage/src/mage/abilities/keyword/MonstrosityAbility.java
index b96fac17af7..698a3d60d58 100644
--- a/Mage/src/mage/abilities/keyword/MonstrosityAbility.java
+++ b/Mage/src/mage/abilities/keyword/MonstrosityAbility.java
@@ -68,7 +68,7 @@ import mage.util.CardUtil;
  * @author LevelX2
  */
 
-public class MonstrosityAbility extends ActivatedAbilityImpl<MonstrosityAbility> {
+public class MonstrosityAbility extends ActivatedAbilityImpl {
 
     private int monstrosityValue;
 
diff --git a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java
index 9faff67c3a0..7d01de81c72 100644
--- a/Mage/src/mage/abilities/keyword/NinjutsuAbility.java
+++ b/Mage/src/mage/abilities/keyword/NinjutsuAbility.java
@@ -69,7 +69,7 @@ import mage.target.common.TargetControlledPermanent;
  *
  * @author LevelX2
  */
-public class NinjutsuAbility extends ActivatedAbilityImpl<NinjutsuAbility> {
+public class NinjutsuAbility extends ActivatedAbilityImpl {
 
     private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("unblocked attacker you control");
 
diff --git a/Mage/src/mage/abilities/keyword/OfferingAbility.java b/Mage/src/mage/abilities/keyword/OfferingAbility.java
index 82060074e5e..b40b396a487 100644
--- a/Mage/src/mage/abilities/keyword/OfferingAbility.java
+++ b/Mage/src/mage/abilities/keyword/OfferingAbility.java
@@ -74,7 +74,7 @@ import mage.util.CardUtil;
  *
  * @author LevelX2
  */
-public class OfferingAbility extends StaticAbility<OfferingAbility> {
+public class OfferingAbility extends StaticAbility {
 
     private FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
 
diff --git a/Mage/src/mage/abilities/keyword/PhasingAbility.java b/Mage/src/mage/abilities/keyword/PhasingAbility.java
index 87ac969f53d..52342fc55c8 100644
--- a/Mage/src/mage/abilities/keyword/PhasingAbility.java
+++ b/Mage/src/mage/abilities/keyword/PhasingAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PhasingAbility extends StaticAbility<PhasingAbility> implements MageSingleton {
+public class PhasingAbility extends StaticAbility implements MageSingleton {
 
     private static final PhasingAbility fINSTANCE =  new PhasingAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/ProtectionAbility.java b/Mage/src/mage/abilities/keyword/ProtectionAbility.java
index a38c52a6bb5..65ced12fa61 100644
--- a/Mage/src/mage/abilities/keyword/ProtectionAbility.java
+++ b/Mage/src/mage/abilities/keyword/ProtectionAbility.java
@@ -45,7 +45,7 @@ import mage.game.stack.Spell;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ProtectionAbility extends StaticAbility<ProtectionAbility> {
+public class ProtectionAbility extends StaticAbility {
 
     protected Filter filter;
 
diff --git a/Mage/src/mage/abilities/keyword/ProwlAbility.java b/Mage/src/mage/abilities/keyword/ProwlAbility.java
index dbff6e7ed4c..2f217db4df2 100644
--- a/Mage/src/mage/abilities/keyword/ProwlAbility.java
+++ b/Mage/src/mage/abilities/keyword/ProwlAbility.java
@@ -59,7 +59,7 @@ import mage.watchers.common.ProwlWatcher;
  * @author LevelX2
  */
 
-public class ProwlAbility extends StaticAbility<ProwlAbility> implements AlternativeSourceCosts {
+public class ProwlAbility extends StaticAbility implements AlternativeSourceCosts {
 
     private static final String PROWL_KEYWORD = "Prowl";
     private final List<AlternativeCost2> prowlCosts = new LinkedList<>();
diff --git a/Mage/src/mage/abilities/keyword/ReachAbility.java b/Mage/src/mage/abilities/keyword/ReachAbility.java
index aa310f6afbf..bca29e6b17e 100644
--- a/Mage/src/mage/abilities/keyword/ReachAbility.java
+++ b/Mage/src/mage/abilities/keyword/ReachAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ReachAbility extends StaticAbility<ReachAbility> implements MageSingleton {
+public class ReachAbility extends StaticAbility implements MageSingleton {
 
     private static final ReachAbility fINSTANCE =  new ReachAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/ReboundAbility.java b/Mage/src/mage/abilities/keyword/ReboundAbility.java
index 7b5a24cf548..f93d87ebdd8 100644
--- a/Mage/src/mage/abilities/keyword/ReboundAbility.java
+++ b/Mage/src/mage/abilities/keyword/ReboundAbility.java
@@ -73,7 +73,7 @@ import java.util.UUID;
  *
  * @author maurer.it_at_gmail.com, noxx
  */
-public class ReboundAbility extends TriggeredAbilityImpl<ReboundAbility> {
+public class ReboundAbility extends TriggeredAbilityImpl {
     //20101001 - 702.85
     private boolean installReboundEffect;
     private static String reboundText = "Rebound <i>(If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)</i>";
@@ -248,7 +248,7 @@ class ReboundCastFromHandReplacementEffect extends ReplacementEffectImpl<Rebound
  *
  * @author maurer.it_at_gmail.com
  */
-class ReboundEffectCastFromExileDelayedTrigger extends DelayedTriggeredAbility<ReboundEffectCastFromExileDelayedTrigger> {
+class ReboundEffectCastFromExileDelayedTrigger extends DelayedTriggeredAbility {
 
     ReboundEffectCastFromExileDelayedTrigger(UUID cardId, UUID sourceId) {
         super(new ReboundCastSpellFromExileEffect(cardId));
diff --git a/Mage/src/mage/abilities/keyword/ReplicateAbility.java b/Mage/src/mage/abilities/keyword/ReplicateAbility.java
index 86e0ea75a5e..bf96287c49c 100644
--- a/Mage/src/mage/abilities/keyword/ReplicateAbility.java
+++ b/Mage/src/mage/abilities/keyword/ReplicateAbility.java
@@ -55,7 +55,7 @@ import mage.players.Player;
  * @author LevelX2
  */
 
-public class ReplicateAbility extends StaticAbility<ReplicateAbility> implements OptionalAdditionalSourceCosts {
+public class ReplicateAbility extends StaticAbility implements OptionalAdditionalSourceCosts {
 
     private static final String keywordText = "Replicate";
     private static final String reminderTextMana = "<i>(When you cast this spell, copy it for each time you paid its replicate cost. You may choose new targets for the copies.)</i>";
@@ -168,7 +168,7 @@ public class ReplicateAbility extends StaticAbility<ReplicateAbility> implements
     }
 }
 
-class ReplicateTriggeredAbility extends TriggeredAbilityImpl<ReplicateTriggeredAbility> {
+class ReplicateTriggeredAbility extends TriggeredAbilityImpl {
 
     public ReplicateTriggeredAbility() {
         super(Zone.STACK, new ReplicateCopyEffect());
diff --git a/Mage/src/mage/abilities/keyword/RetraceAbility.java b/Mage/src/mage/abilities/keyword/RetraceAbility.java
index 2347e178270..b95eae60a6d 100644
--- a/Mage/src/mage/abilities/keyword/RetraceAbility.java
+++ b/Mage/src/mage/abilities/keyword/RetraceAbility.java
@@ -47,7 +47,7 @@ import mage.target.common.TargetCardInHand;
  *
  * @author Plopman
  */
-public class RetraceAbility extends ActivatedAbilityImpl<RetraceAbility> {
+public class RetraceAbility extends ActivatedAbilityImpl {
 
     public RetraceAbility(Cost cost, TimingRule timingRule) {
         super(Zone.GRAVEYARD, new RetraceEffect(), cost);
diff --git a/Mage/src/mage/abilities/keyword/ScavengeAbility.java b/Mage/src/mage/abilities/keyword/ScavengeAbility.java
index b07f0a4ee87..74088ec93f4 100644
--- a/Mage/src/mage/abilities/keyword/ScavengeAbility.java
+++ b/Mage/src/mage/abilities/keyword/ScavengeAbility.java
@@ -59,7 +59,7 @@ import mage.target.common.TargetCreaturePermanent;
 //    a sorcery."
 //
 
-public class ScavengeAbility extends ActivatedAbilityImpl<ScavengeAbility> {
+public class ScavengeAbility extends ActivatedAbilityImpl {
 
     public ScavengeAbility(ManaCosts costs) {
         super(Zone.GRAVEYARD, new ScavengeEffect(), costs);
diff --git a/Mage/src/mage/abilities/keyword/ShadowAbility.java b/Mage/src/mage/abilities/keyword/ShadowAbility.java
index b1db9ec2169..27472a61fb7 100644
--- a/Mage/src/mage/abilities/keyword/ShadowAbility.java
+++ b/Mage/src/mage/abilities/keyword/ShadowAbility.java
@@ -14,7 +14,7 @@ import java.io.ObjectStreamException;
  * "Shadow" keyword
  * @author Loki
  */
-public class ShadowAbility extends EvasionAbility<ShadowAbility> implements MageSingleton {
+public class ShadowAbility extends EvasionAbility implements MageSingleton {
     private static final ShadowAbility fINSTANCE =  new ShadowAbility();
 
     private Object readResolve() throws ObjectStreamException {
diff --git a/Mage/src/mage/abilities/keyword/ShroudAbility.java b/Mage/src/mage/abilities/keyword/ShroudAbility.java
index 5d02956085f..f796e2a8db0 100644
--- a/Mage/src/mage/abilities/keyword/ShroudAbility.java
+++ b/Mage/src/mage/abilities/keyword/ShroudAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ShroudAbility extends StaticAbility<ShroudAbility> implements MageSingleton {
+public class ShroudAbility extends StaticAbility implements MageSingleton {
 
     private static final ShroudAbility fINSTANCE =  new ShroudAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/SoulbondAbility.java b/Mage/src/mage/abilities/keyword/SoulbondAbility.java
index 28c0c5a711a..eb39830a782 100644
--- a/Mage/src/mage/abilities/keyword/SoulbondAbility.java
+++ b/Mage/src/mage/abilities/keyword/SoulbondAbility.java
@@ -36,7 +36,7 @@ import mage.constants.Zone;
 /**
  * @author noxx
  */
-public class SoulbondAbility extends StaticAbility<SoulbondAbility> implements MageSingleton {
+public class SoulbondAbility extends StaticAbility implements MageSingleton {
 
     private static final SoulbondAbility fINSTANCE = new SoulbondAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/StormAbility.java b/Mage/src/mage/abilities/keyword/StormAbility.java
index 1710d73bfe2..aa43978b352 100644
--- a/Mage/src/mage/abilities/keyword/StormAbility.java
+++ b/Mage/src/mage/abilities/keyword/StormAbility.java
@@ -46,7 +46,7 @@ import mage.watchers.common.CastSpellLastTurnWatcher;
  *
  * @author Plopman
  */
-public class StormAbility extends TriggeredAbilityImpl<StormAbility> {
+public class StormAbility extends TriggeredAbilityImpl {
 
     public StormAbility() {
         super(Zone.STACK, new StormEffect());
diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/mage/abilities/keyword/SuspendAbility.java
index 4241107530f..a794c6603d3 100644
--- a/Mage/src/mage/abilities/keyword/SuspendAbility.java
+++ b/Mage/src/mage/abilities/keyword/SuspendAbility.java
@@ -136,7 +136,7 @@ import mage.players.Player;
  */
 
 
-public class SuspendAbility extends  ActivatedAbilityImpl<SuspendAbility> {
+public class SuspendAbility extends ActivatedAbilityImpl {
 
     private String ruleText;
     private boolean gainedTemporary;
@@ -258,7 +258,7 @@ class SuspendExileEffect extends OneShotEffect<SuspendExileEffect> {
     }
 }
 
-class SuspendPlayCardAbility extends TriggeredAbilityImpl<SuspendPlayCardAbility> {
+class SuspendPlayCardAbility extends TriggeredAbilityImpl {
 
     public SuspendPlayCardAbility(boolean isCreature) {
         super(Zone.EXILED, new SuspendPlayCardEffect(isCreature));
diff --git a/Mage/src/mage/abilities/keyword/TrampleAbility.java b/Mage/src/mage/abilities/keyword/TrampleAbility.java
index 478460aebeb..ea6d253ff7a 100644
--- a/Mage/src/mage/abilities/keyword/TrampleAbility.java
+++ b/Mage/src/mage/abilities/keyword/TrampleAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TrampleAbility extends StaticAbility<TrampleAbility> implements MageSingleton {
+public class TrampleAbility extends StaticAbility implements MageSingleton {
 
     private static final TrampleAbility fINSTANCE =  new TrampleAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/UnblockableAbility.java b/Mage/src/mage/abilities/keyword/UnblockableAbility.java
index 89b7773e132..f3936a50af6 100644
--- a/Mage/src/mage/abilities/keyword/UnblockableAbility.java
+++ b/Mage/src/mage/abilities/keyword/UnblockableAbility.java
@@ -34,7 +34,7 @@ import mage.abilities.effects.common.combat.UnblockableSourceEffect;
 /**
  * @author BetaSteward_at_googlemail.com
  */
-public class UnblockableAbility extends EvasionAbility<UnblockableAbility> {
+public class UnblockableAbility extends EvasionAbility {
 
     public UnblockableAbility() {
         this("");
diff --git a/Mage/src/mage/abilities/keyword/UnearthAbility.java b/Mage/src/mage/abilities/keyword/UnearthAbility.java
index b2470ca2c29..714c0676e6a 100644
--- a/Mage/src/mage/abilities/keyword/UnearthAbility.java
+++ b/Mage/src/mage/abilities/keyword/UnearthAbility.java
@@ -60,7 +60,7 @@ import mage.game.events.ZoneChangeEvent;
  * Activate this ability only any time you could cast a sorcery."
  *
  */
-public class UnearthAbility extends ActivatedAbilityImpl<UnearthAbility> {
+public class UnearthAbility extends ActivatedAbilityImpl {
 
     public UnearthAbility(ManaCosts costs) {
         super(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), costs);
@@ -89,7 +89,7 @@ public class UnearthAbility extends ActivatedAbilityImpl<UnearthAbility> {
 
 }
 
-class UnearthDelayedTriggeredAbility extends DelayedTriggeredAbility<UnearthDelayedTriggeredAbility> {
+class UnearthDelayedTriggeredAbility extends DelayedTriggeredAbility {
 
     public UnearthDelayedTriggeredAbility() {
         super(new ExileSourceEffect());
diff --git a/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java b/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java
index fe56c77b535..2cb6bd4cbbb 100644
--- a/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java
+++ b/Mage/src/mage/abilities/keyword/VanishingSacrificeAbility.java
@@ -8,7 +8,7 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
-public class VanishingSacrificeAbility extends TriggeredAbilityImpl<VanishingSacrificeAbility> {
+public class VanishingSacrificeAbility extends TriggeredAbilityImpl {
     public VanishingSacrificeAbility() {
         super(Zone.BATTLEFIELD, new SacrificeSourceEffect());
         this.setRuleVisible(false);
diff --git a/Mage/src/mage/abilities/keyword/VigilanceAbility.java b/Mage/src/mage/abilities/keyword/VigilanceAbility.java
index 33e4a035f8b..44291510b0d 100644
--- a/Mage/src/mage/abilities/keyword/VigilanceAbility.java
+++ b/Mage/src/mage/abilities/keyword/VigilanceAbility.java
@@ -38,7 +38,7 @@ import java.io.ObjectStreamException;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class VigilanceAbility extends StaticAbility<VigilanceAbility> implements MageSingleton {
+public class VigilanceAbility extends StaticAbility implements MageSingleton {
 
     private static final VigilanceAbility fINSTANCE =  new VigilanceAbility();
 
diff --git a/Mage/src/mage/abilities/keyword/WitherAbility.java b/Mage/src/mage/abilities/keyword/WitherAbility.java
index 7ce1431b28e..238a7511e80 100644
--- a/Mage/src/mage/abilities/keyword/WitherAbility.java
+++ b/Mage/src/mage/abilities/keyword/WitherAbility.java
@@ -47,7 +47,7 @@ import java.io.ObjectStreamException;
  *
  *  @author nantuko
  */
-public class WitherAbility extends StaticAbility<WitherAbility> implements MageSingleton {
+public class WitherAbility extends StaticAbility implements MageSingleton {
 
     private static final WitherAbility fINSTANCE =  new WitherAbility();
 
diff --git a/Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java b/Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java
index ce9b0bfd851..efeafa383b8 100644
--- a/Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java
+++ b/Mage/src/mage/abilities/mana/DelayedTriggeredManaAbility.java
@@ -37,7 +37,7 @@ import mage.constants.Duration;
 /**
  * @author Plopman
  */
-public abstract class DelayedTriggeredManaAbility<T extends DelayedTriggeredManaAbility<T>> extends DelayedTriggeredAbility<T> {
+public abstract class DelayedTriggeredManaAbility<T extends DelayedTriggeredManaAbility<T>> extends DelayedTriggeredAbility {
 
     public DelayedTriggeredManaAbility(Zone zone, ManaEffect effect) {
         super(effect);
diff --git a/Mage/src/mage/abilities/mana/ManaAbility.java b/Mage/src/mage/abilities/mana/ManaAbility.java
index ff28582da96..e0a19de2831 100644
--- a/Mage/src/mage/abilities/mana/ManaAbility.java
+++ b/Mage/src/mage/abilities/mana/ManaAbility.java
@@ -43,7 +43,7 @@ import java.util.UUID;
  * @author BetaSteward_at_googlemail.com
  * @param <T>
  */
-public abstract class ManaAbility<T extends ManaAbility<T>> extends ActivatedAbilityImpl<T> {
+public abstract class ManaAbility<T extends ManaAbility<T>> extends ActivatedAbilityImpl {
 
     protected Mana netMana = new Mana();
 
diff --git a/Mage/src/mage/abilities/mana/TriggeredManaAbility.java b/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
index 0d4f459ec84..35c0c17359d 100644
--- a/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
+++ b/Mage/src/mage/abilities/mana/TriggeredManaAbility.java
@@ -35,7 +35,7 @@ import mage.abilities.effects.common.ManaEffect;
  * see 20110715 - 605.1b
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class TriggeredManaAbility<T extends TriggeredManaAbility<T>> extends TriggeredAbilityImpl<T> {
+public abstract class TriggeredManaAbility<T extends TriggeredManaAbility<T>> extends TriggeredAbilityImpl {
 
     public TriggeredManaAbility(Zone zone, ManaEffect effect) {
         this(zone, effect, false);
diff --git a/Mage/src/mage/cards/mock/MockAbility.java b/Mage/src/mage/cards/mock/MockAbility.java
index 05d2a1456c7..1f16d76fb72 100644
--- a/Mage/src/mage/cards/mock/MockAbility.java
+++ b/Mage/src/mage/cards/mock/MockAbility.java
@@ -4,7 +4,7 @@ import mage.abilities.AbilityImpl;
 import mage.constants.AbilityType;
 import mage.constants.Zone;
 
-class MockAbility extends AbilityImpl<MockAbility> {
+class MockAbility extends AbilityImpl {
 
     private final String text;