diff --git a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java
index 3c71dfcf59..100d78f4c7 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/FireIce.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/FireIce.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetCreatureOrPlayerAmount;
  */
 
 
-public class FireIce extends SplitCard<FireIce> {
+public class FireIce extends SplitCard {
 
     public FireIce(UUID ownerId) {
         super(ownerId, 128, "Fire", "Ice", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}", "{1}{U}", false);
diff --git a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java
index 5600eb7090..543245fbe2 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/IllusionReality.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetSpellOrPermanent;
  * @author LevelX2
  */
 
-public class IllusionReality extends SplitCard<IllusionReality> {
+public class IllusionReality extends SplitCard {
 
     public IllusionReality(UUID ownerId) {
         super(ownerId, 129, "Illusion", "Reality", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{U}", "{2}{G}", false);
diff --git a/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java b/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java
index bc236f46e6..f6bf2f864b 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/LifeDeath.java
@@ -53,7 +53,7 @@ import mage.target.common.TargetCardInYourGraveyard;
  * @author LevelX2
  */
 
-public class LifeDeath extends SplitCard<LifeDeath> {
+public class LifeDeath extends SplitCard {
 
     public LifeDeath(UUID ownerId) {
         super(ownerId, 130, "Life", "Death", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{G}", "{1}{B}", false);
diff --git a/Mage.Sets/src/mage/sets/apocalypse/NightDay.java b/Mage.Sets/src/mage/sets/apocalypse/NightDay.java
index 04b235ee4e..5c3dd614d1 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/NightDay.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/NightDay.java
@@ -51,7 +51,7 @@ import mage.target.common.TargetCreaturePermanent;
  * @author LevelX2
  */
 
-public class NightDay extends SplitCard<NightDay> {
+public class NightDay extends SplitCard {
 
     public NightDay(UUID ownerId) {
         super(ownerId, 131, "Night", "Day", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{B}", "{2}{W}", false);
diff --git a/Mage.Sets/src/mage/sets/apocalypse/OrderChaos.java b/Mage.Sets/src/mage/sets/apocalypse/OrderChaos.java
index 04b59d7dc0..c86254ba88 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/OrderChaos.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/OrderChaos.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetAttackingCreature;
  */
 
 
-public class OrderChaos extends SplitCard<OrderChaos> {
+public class OrderChaos extends SplitCard {
 
     public OrderChaos(UUID ownerId) {
         super(ownerId, 132, "Order", "Chaos", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{3}{W}", "{2}{R}", false);
diff --git a/Mage.Sets/src/mage/sets/commander2013/RoughTumble.java b/Mage.Sets/src/mage/sets/commander2013/RoughTumble.java
index 580711eb62..e281caac89 100644
--- a/Mage.Sets/src/mage/sets/commander2013/RoughTumble.java
+++ b/Mage.Sets/src/mage/sets/commander2013/RoughTumble.java
@@ -42,7 +42,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate;
  *
  * @author LevelX2
  */
-public class RoughTumble extends SplitCard<RoughTumble> {
+public class RoughTumble extends SplitCard {
 
     private static final FilterCreaturePermanent filterFlying = new FilterCreaturePermanent("creature with flying");
     private static final FilterCreaturePermanent filterWithoutFlying = new FilterCreaturePermanent("creature without flying");
diff --git a/Mage.Sets/src/mage/sets/dissension/HideSeek.java b/Mage.Sets/src/mage/sets/dissension/HideSeek.java
index 2ac0b7bd5d..a028528bfd 100644
--- a/Mage.Sets/src/mage/sets/dissension/HideSeek.java
+++ b/Mage.Sets/src/mage/sets/dissension/HideSeek.java
@@ -52,7 +52,7 @@ import mage.target.common.TargetOpponent;
  *
  * @author LevelX2
  */
-public class HideSeek extends SplitCard<HideSeek> {
+public class HideSeek extends SplitCard {
 
     private static final FilterPermanent filter = new FilterPermanent("artifact or enchantment");
 
diff --git a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java
index 21c347a426..761f8a793d 100644
--- a/Mage.Sets/src/mage/sets/dissension/OddsEnds.java
+++ b/Mage.Sets/src/mage/sets/dissension/OddsEnds.java
@@ -52,7 +52,7 @@ import mage.target.TargetSpell;
  */
 
 
-public class OddsEnds extends SplitCard<OddsEnds> {
+public class OddsEnds extends SplitCard {
 
     private static final FilterSpell filter = new FilterSpell("instant or sorcery spell");
     static {
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java
index 95ce173017..e7c5a1be8a 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/AliveWell.java
@@ -44,7 +44,7 @@ import mage.players.Player;
  *
  * @author LevelX2
  */
-public class AliveWell extends SplitCard<AliveWell> {
+public class AliveWell extends SplitCard {
 
     public AliveWell(UUID ownerId) {
         super(ownerId, 121, "Alive", "Well", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{G}","{W}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java
index 5e71f72937..6b69d3ba91 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ArmedDangerous.java
@@ -45,7 +45,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 
 
-public class ArmedDangerous extends SplitCard<ArmedDangerous> {
+public class ArmedDangerous extends SplitCard {
 
     public ArmedDangerous(UUID ownerId) {
         super(ownerId, 122, "Armed", "Dangerous", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{R}", "{3}{G}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
index bc796cd7db..5aa0750d09 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BeckCall.java
@@ -49,7 +49,7 @@ import mage.game.permanent.Permanent;
  */
 
 
-public class BeckCall extends SplitCard<BeckCall> {
+public class BeckCall extends SplitCard {
 
     public BeckCall(UUID ownerId) {
         super(ownerId, 123, "Beck", "Call", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{G}{U}", "{4}{W}{U}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java
index 9b89d1c63e..1d8370553f 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/BreakingEntering.java
@@ -57,7 +57,7 @@ import mage.target.targetpointer.FixedTarget;
  */
 
 
-public class BreakingEntering extends SplitCard<BreakingEntering> {
+public class BreakingEntering extends SplitCard {
 
     public BreakingEntering(UUID ownerId) {
         super(ownerId, 124, "Breaking", "Entering", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{U}{B}", "{4}{B}{R}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java
index 733f08be89..1f19e7a656 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java
@@ -64,7 +64,7 @@ import mage.target.common.TargetControlledPermanent;
  */
 
 
-public class CatchRelease extends SplitCard<CatchRelease> {
+public class CatchRelease extends SplitCard {
 
     public CatchRelease(UUID ownerId) {
         super(ownerId, 125, "Catch", "Release", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{U}{R}", "{4}{R}{W}",true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java
index dff5b211cb..a6df9ac205 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/DownDirty.java
@@ -43,7 +43,7 @@ import mage.target.common.TargetCardInYourGraveyard;
  */
 
 
-public class DownDirty extends SplitCard<DownDirty> {
+public class DownDirty extends SplitCard {
 
     public DownDirty(UUID ownerId) {
         super(ownerId, 126, "Down", "Dirty", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{3}{B}", "{2}{G}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java
index fd5330b0fa..694ce00dc0 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/FarAway.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 
 
-public class FarAway extends SplitCard<FarAway> {
+public class FarAway extends SplitCard {
 
     public FarAway(UUID ownerId) {
         super(ownerId, 127, "Far", "Away", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{U}", "{2}{B}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java
index 5e5cdc3732..5384b5b7d2 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/FleshBlood.java
@@ -54,7 +54,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 
 
-public class FleshBlood extends SplitCard<FleshBlood> {
+public class FleshBlood extends SplitCard {
 
     public FleshBlood(UUID ownerId) {
         super(ownerId, 128, "Flesh", "Blood", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}{G}", "{R}{G}",true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java
index f3b6cafd41..1661a9dd2f 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/GiveTake.java
@@ -46,7 +46,7 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author LevelX2
  */
-public class GiveTake extends SplitCard<GiveTake> {
+public class GiveTake extends SplitCard {
 
     public GiveTake(UUID ownerId) {
         super(ownerId, 129, "Give", "Take", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{G}","{2}{U}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java
index 73312024db..e407a150fb 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProfitLoss.java
@@ -46,7 +46,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
  */
 
 
-public class ProfitLoss extends SplitCard<ProfitLoss> {
+public class ProfitLoss extends SplitCard {
 
     private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
     static {
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java
index 0894a08aed..981aa007a3 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ProtectServe.java
@@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent;
  */
 
 
-public class ProtectServe extends SplitCard<ProtectServe> {
+public class ProtectServe extends SplitCard {
 
     public ProtectServe(UUID ownerId) {
         super(ownerId, 131, "Protect", "Serve", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{W}", "{1}{U}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java
index f6a4efc55e..0904b8d999 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ReadyWilling.java
@@ -47,7 +47,7 @@ import mage.filter.common.FilterCreaturePermanent;
  *
  * @author LevelX2
  */
-public class ReadyWilling extends SplitCard<ReadyWilling> {
+public class ReadyWilling extends SplitCard {
 
     public ReadyWilling(UUID ownerId) {
         super(ownerId, 132, "Ready", "Willing", Rarity.RARE, new CardType[]{CardType.INSTANT}, "{1}{G}{W}", "{1}{W}{B}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java
index aaf6a80a30..608f1a0f11 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/ToilTrouble.java
@@ -48,7 +48,7 @@ import mage.target.TargetPlayer;
  */
 
 
-public class ToilTrouble extends SplitCard<ToilTrouble> {
+public class ToilTrouble extends SplitCard {
 
     public ToilTrouble(UUID ownerId) {
         super(ownerId, 133, "Toil", "Trouble", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{2}{B}", "{2}{R}",true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java
index cd584d7718..c7241a59c7 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/TurnBurn.java
@@ -47,7 +47,7 @@ import mage.target.common.TargetCreaturePermanent;
  *
  * @author LevelX2
  */
-public class TurnBurn extends SplitCard<TurnBurn> {
+public class TurnBurn extends SplitCard {
 
     public TurnBurn(UUID ownerId) {
         super(ownerId, 134, "Turn", "Burn", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{2}{U}", "{1}{R}", true);
diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java
index 8bc5ae6051..f46427a56d 100644
--- a/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java
+++ b/Mage.Sets/src/mage/sets/dragonsmaze/WearTear.java
@@ -41,7 +41,7 @@ import mage.target.common.TargetArtifactPermanent;
  *
  * @author LevelX2
  */
-public class WearTear extends SplitCard<WearTear> {
+public class WearTear extends SplitCard {
 
     public WearTear(UUID ownerId) {
         super(ownerId, 135, "Wear", "Tear", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{R}", "{W}", true);
diff --git a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java
index 5614bedbcb..bb8b6f266d 100644
--- a/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java
+++ b/Mage.Sets/src/mage/sets/invasion/AssaultBattery.java
@@ -44,7 +44,7 @@ import mage.target.common.TargetCreatureOrPlayer;
  */
 
 
-public class AssaultBattery extends SplitCard<AssaultBattery> {
+public class AssaultBattery extends SplitCard {
 
     public AssaultBattery(UUID ownerId) {
         super(ownerId, 295, "Assault", "Battery", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{R}", "{3}{G}", false);
diff --git a/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java b/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java
index 751dd906a4..5f9bd3bf3b 100644
--- a/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java
+++ b/Mage.Sets/src/mage/sets/planarchaos/BoomBust.java
@@ -47,7 +47,7 @@ import mage.target.TargetPermanent;
  */
 
 
-public class BoomBust extends SplitCard<BoomBust> {
+public class BoomBust extends SplitCard {
 
     private static final FilterLandPermanent filter1 = new FilterLandPermanent("land you control");
     private static final FilterLandPermanent filter2 = new FilterLandPermanent("land you don't control");
diff --git a/Mage/src/mage/cards/SplitCard.java b/Mage/src/mage/cards/SplitCard.java
index dc30e6ba8e..5101b1451b 100644
--- a/Mage/src/mage/cards/SplitCard.java
+++ b/Mage/src/mage/cards/SplitCard.java
@@ -46,10 +46,8 @@ import mage.watchers.Watcher;
 /**
  *
  * @author LevelX2
- * @param <T>
  */
-
-public abstract class SplitCard<T extends SplitCard<T>> extends CardImpl {
+public abstract class SplitCard extends CardImpl {
 
     protected Card leftHalfCard;
     protected Card rightHalfCard;
diff --git a/Mage/src/mage/cards/mock/MockSplitCard.java b/Mage/src/mage/cards/mock/MockSplitCard.java
index fb7c5c3234..fd9e8a0618 100644
--- a/Mage/src/mage/cards/mock/MockSplitCard.java
+++ b/Mage/src/mage/cards/mock/MockSplitCard.java
@@ -12,7 +12,7 @@ import mage.constants.CardType;
  *
  * @author North
  */
-public class MockSplitCard extends SplitCard<MockSplitCard> {
+public class MockSplitCard extends SplitCard {
 
     public MockSplitCard(CardInfo card) {
         super(null,