diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelType.java b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelType.java
index 37ea9bc88d..137bc0c089 100644
--- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelType.java
+++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/src/mage/game/CommanderDuelType.java
@@ -34,7 +34,7 @@ import mage.game.match.MatchType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CommanderDuelType extends MatchType<CommanderDuelType> {
+public class CommanderDuelType extends MatchType {
 
     public CommanderDuelType() {
         this.name = "Commander Two Player Duel";
diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/src/mage/game/CommanderFreeForAllType.java b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/src/mage/game/CommanderFreeForAllType.java
index b71d11dc5f..9c090de691 100644
--- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/src/mage/game/CommanderFreeForAllType.java
+++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/src/mage/game/CommanderFreeForAllType.java
@@ -35,7 +35,7 @@ import mage.game.match.MatchType;
  *
  * @author LevelX2
  */
-public class CommanderFreeForAllType extends MatchType<CommanderFreeForAllType> {
+public class CommanderFreeForAllType extends MatchType {
 
     public CommanderFreeForAllType() {
         this.name = "Commander Free For All";
diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
index 5d17043a0f..1af1a1728a 100644
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAll.java
@@ -40,7 +40,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FreeForAll extends GameImpl<FreeForAll> {
+public class FreeForAll extends GameImpl {
 
     private int numPlayers;
 
diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
index 9bdc912dd6..bb73023f86 100644
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/src/mage/game/FreeForAllType.java
@@ -34,7 +34,7 @@ import mage.game.match.MatchType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FreeForAllType extends MatchType<FreeForAllType> {
+public class FreeForAllType extends MatchType {
 
     public FreeForAllType() {
         this.name = "Free For All";
diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
index 7024f0ad56..d71b96f003 100644
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
@@ -38,7 +38,7 @@ import mage.game.match.MatchType;
 import mage.game.turn.TurnMod;
 import mage.players.Player;
 
-public class TwoPlayerDuel extends GameImpl<TwoPlayerDuel> {
+public class TwoPlayerDuel extends GameImpl {
 
     public TwoPlayerDuel(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans) {
         super(attackOption, range, freeMulligans);
diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
index fca4f130ba..cf607daf5f 100644
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuelType.java
@@ -34,7 +34,7 @@ import mage.game.match.MatchType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TwoPlayerDuelType extends MatchType<TwoPlayerDuelType> {
+public class TwoPlayerDuelType extends MatchType {
 
     public TwoPlayerDuelType() {
         this.name = "Two Player Duel";
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationCubeTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationCubeTournamentType.java
index f1e5dc3603..d51a0569d6 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationCubeTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationCubeTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author LevelX2
  */
-public class BoosterDraftEliminationCubeTournamentType extends TournamentType<BoosterDraftEliminationCubeTournamentType> {
+public class BoosterDraftEliminationCubeTournamentType extends TournamentType {
 
     public BoosterDraftEliminationCubeTournamentType() {
         this.name = "Booster Draft Elimination (Cube)";
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournamentType.java
index d0775cd389..8b54860123 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftEliminationTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class BoosterDraftEliminationTournamentType extends TournamentType<BoosterDraftEliminationTournamentType> {
+public class BoosterDraftEliminationTournamentType extends TournamentType {
 
     public BoosterDraftEliminationTournamentType() {
         this.name = "Booster Draft Elimination";
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissCubeTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissCubeTournamentType.java
index 5943077200..f8809f7c14 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissCubeTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissCubeTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author LevelX2
  */
-public class BoosterDraftSwissCubeTournamentType extends TournamentType<BoosterDraftSwissCubeTournamentType> {
+public class BoosterDraftSwissCubeTournamentType extends TournamentType {
 
     public BoosterDraftSwissCubeTournamentType() {
         this.name = "Booster Draft Swiss (Cube)";
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissTournamentType.java
index f13660a6a1..185e396987 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/BoosterDraftSwissTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author LevelX2
  */
-public class BoosterDraftSwissTournamentType extends TournamentType<BoosterDraftSwissTournamentType> {
+public class BoosterDraftSwissTournamentType extends TournamentType {
 
     public BoosterDraftSwissTournamentType() {
         this.name = "Booster Draft Swiss";
diff --git a/Mage.Server.Plugins/Mage.Tournament.Constructed/src/mage/tournament/ConstructedEliminationTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.Constructed/src/mage/tournament/ConstructedEliminationTournamentType.java
index 4afb70a7c1..4893d56c39 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Constructed/src/mage/tournament/ConstructedEliminationTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.Constructed/src/mage/tournament/ConstructedEliminationTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  * @author LevelX2
  */
 
-public class ConstructedEliminationTournamentType extends TournamentType<ConstructedEliminationTournamentType> {
+public class ConstructedEliminationTournamentType extends TournamentType {
 
     public ConstructedEliminationTournamentType() {
         this.name = "Elimination Constructed";
diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationCubeTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationCubeTournamentType.java
index c9c550707e..bfcacc955d 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationCubeTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationCubeTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author LevelX2
  */
-public class SealedEliminationCubeTournamentType extends TournamentType<SealedEliminationCubeTournamentType> {
+public class SealedEliminationCubeTournamentType extends TournamentType {
 
     public SealedEliminationCubeTournamentType() {
         this.name = "Sealed Elimination (Cube)";
diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationTournamentType.java
index 92a437ae82..35424f5401 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedEliminationTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SealedEliminationTournamentType extends TournamentType<SealedEliminationTournamentType> {
+public class SealedEliminationTournamentType extends TournamentType {
 
     public SealedEliminationTournamentType() {
         this.name = "Sealed Elimination";
diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissCubeTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissCubeTournamentType.java
index 410321a780..86c98597b7 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissCubeTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissCubeTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SealedSwissCubeTournamentType extends TournamentType<SealedSwissCubeTournamentType> {
+public class SealedSwissCubeTournamentType extends TournamentType {
 
     public SealedSwissCubeTournamentType() {
         this.name = "Sealed Swiss (Cube)";
diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissTournamentType.java
index 4badd34391..6d13e603a8 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissTournamentType.java
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/src/mage/tournament/SealedSwissTournamentType.java
@@ -34,7 +34,7 @@ import mage.game.tournament.TournamentType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SealedSwissTournamentType extends TournamentType<SealedSwissTournamentType> {
+public class SealedSwissTournamentType extends TournamentType {
 
     public SealedSwissTournamentType() {
         this.name = "Sealed Swiss";
diff --git a/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java b/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java
index 0a6e7848b0..11d9f07db0 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/PrimalClay.java
@@ -138,7 +138,7 @@ class PrimalClayEffect extends ContinuousEffectImpl {
     }
 }
 
-class PrimalClayChoice extends ChoiceImpl<PrimalClayChoice> {
+class PrimalClayChoice extends ChoiceImpl {
     PrimalClayChoice() {
         super(true);
         this.setMessage("Choose for Primal Clay to be");
diff --git a/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java b/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java
index a791c0b9ae..5bf59b9bef 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/PrimalPlasma.java
@@ -132,7 +132,7 @@ class PrimalPlasmaEffect extends ContinuousEffectImpl {
         return new PrimalPlasmaEffect(this);
     }
 }
-class PrimalPlasmaChoice extends ChoiceImpl<PrimalPlasmaChoice> {
+class PrimalPlasmaChoice extends ChoiceImpl {
     PrimalPlasmaChoice() {
         super(true);
         this.choices.add("a 3/3 creature");
diff --git a/Mage/src/mage/choices/ChoiceBasicLandType.java b/Mage/src/mage/choices/ChoiceBasicLandType.java
index aeff7bac26..271d9675ae 100644
--- a/Mage/src/mage/choices/ChoiceBasicLandType.java
+++ b/Mage/src/mage/choices/ChoiceBasicLandType.java
@@ -32,7 +32,7 @@ package mage.choices;
  *
  * @author LevelX2
  */
-public class ChoiceBasicLandType extends ChoiceImpl<ChoiceBasicLandType> {
+public class ChoiceBasicLandType extends ChoiceImpl {
 
     public ChoiceBasicLandType() {
         super(true);
diff --git a/Mage/src/mage/choices/ChoiceColor.java b/Mage/src/mage/choices/ChoiceColor.java
index c777be594f..71ffdcc30d 100644
--- a/Mage/src/mage/choices/ChoiceColor.java
+++ b/Mage/src/mage/choices/ChoiceColor.java
@@ -34,7 +34,7 @@ import mage.ObjectColor;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class ChoiceColor extends ChoiceImpl<ChoiceColor> {
+public class ChoiceColor extends ChoiceImpl {
 
     public ChoiceColor() {
         super(true);
diff --git a/Mage/src/mage/choices/ChoiceImpl.java b/Mage/src/mage/choices/ChoiceImpl.java
index ba2802c64c..f78ad0543d 100644
--- a/Mage/src/mage/choices/ChoiceImpl.java
+++ b/Mage/src/mage/choices/ChoiceImpl.java
@@ -35,9 +35,8 @@ import java.util.Set;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public class ChoiceImpl<T extends ChoiceImpl<T>> implements Choice, Serializable {
+public class ChoiceImpl implements Choice, Serializable {
 
     protected boolean chosen;
     protected boolean required;
@@ -53,7 +52,7 @@ public class ChoiceImpl<T extends ChoiceImpl<T>> implements Choice, Serializable
         this.required = required;
     }
 
-    public ChoiceImpl(ChoiceImpl<T> choice) {
+    public ChoiceImpl(ChoiceImpl choice) {
         this.choice = choice.choice;
         this.chosen = choice.chosen;
         this.required = choice.required;
@@ -111,8 +110,8 @@ public class ChoiceImpl<T extends ChoiceImpl<T>> implements Choice, Serializable
     }
 
     @Override
-    public T copy() {
-        return (T)new ChoiceImpl(this);
+    public ChoiceImpl copy() {
+        return new ChoiceImpl(this);
     }
 
 }
diff --git a/Mage/src/mage/choices/ChoiceLeftOrRight.java b/Mage/src/mage/choices/ChoiceLeftOrRight.java
index 04c119f5ca..31169cb3ff 100644
--- a/Mage/src/mage/choices/ChoiceLeftOrRight.java
+++ b/Mage/src/mage/choices/ChoiceLeftOrRight.java
@@ -33,7 +33,7 @@ package mage.choices;
  * @author LevelX2
  */
 
-public class ChoiceLeftOrRight extends ChoiceImpl<ChoiceLeftOrRight> {
+public class ChoiceLeftOrRight extends ChoiceImpl {
 
     public ChoiceLeftOrRight() {
         super(true);
diff --git a/Mage/src/mage/game/GameCommanderImpl.java b/Mage/src/mage/game/GameCommanderImpl.java
index c147f9a4b1..7a069ca4ad 100644
--- a/Mage/src/mage/game/GameCommanderImpl.java
+++ b/Mage/src/mage/game/GameCommanderImpl.java
@@ -53,7 +53,7 @@ import mage.players.Player;
 import mage.target.common.TargetCardInHand;
 import mage.watchers.common.CommanderCombatDamageWatcher;
 
-public abstract class GameCommanderImpl extends GameImpl<GameCommanderImpl> {
+public abstract class GameCommanderImpl extends GameImpl {
 
     private final Map<UUID, Cards> mulliganedCards = new HashMap<UUID, Cards>();
     private final Set<CommanderCombatDamageWatcher> commanderCombatWatcher = new HashSet<CommanderCombatDamageWatcher>();
diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java
index 911dfcdb75..f4e551cb14 100644
--- a/Mage/src/mage/game/GameImpl.java
+++ b/Mage/src/mage/game/GameImpl.java
@@ -122,7 +122,7 @@ import mage.watchers.common.PlayerLostLifeWatcher;
 import mage.watchers.common.SoulbondWatcher;
 import org.apache.log4j.Logger;
 
-public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializable {
+public abstract class GameImpl implements Game, Serializable {
 
     private static final transient Logger logger = Logger.getLogger(GameImpl.class);
 
@@ -189,9 +189,6 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
     private boolean saveGame = false;
     private int priorityTime;
 
-    @Override
-    public abstract T copy();
-
     public GameImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans) {
         this.id = UUID.randomUUID();
         this.range = range;
@@ -201,7 +198,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
         // this.actions = new LinkedList<MageAction>();
     }
 
-    public GameImpl(final GameImpl<T> game) {
+    public GameImpl(final GameImpl game) {
         long t1 = 0;
         if (logger.isDebugEnabled()) {
             t1 = System.currentTimeMillis();
diff --git a/Mage/src/mage/game/draft/BoosterDraft.java b/Mage/src/mage/game/draft/BoosterDraft.java
index d7a0c6d3de..305bdb1476 100644
--- a/Mage/src/mage/game/draft/BoosterDraft.java
+++ b/Mage/src/mage/game/draft/BoosterDraft.java
@@ -35,7 +35,7 @@ import mage.cards.ExpansionSet;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class BoosterDraft extends DraftImpl<BoosterDraft> {
+public class BoosterDraft extends DraftImpl {
 
     public BoosterDraft(DraftOptions options, List<ExpansionSet> sets) {
         super(options, sets);
diff --git a/Mage/src/mage/game/draft/DraftImpl.java b/Mage/src/mage/game/draft/DraftImpl.java
index 40afbd8b87..79f52948fb 100644
--- a/Mage/src/mage/game/draft/DraftImpl.java
+++ b/Mage/src/mage/game/draft/DraftImpl.java
@@ -48,9 +48,8 @@ import mage.players.PlayerList;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class DraftImpl<T extends DraftImpl<T>> implements Draft {
+public abstract class DraftImpl implements Draft {
 
     protected final UUID id;
     protected final Map<UUID, DraftPlayer> players = new HashMap<>();
diff --git a/Mage/src/mage/game/match/MatchType.java b/Mage/src/mage/game/match/MatchType.java
index 3edbc1f125..6dbb83f248 100644
--- a/Mage/src/mage/game/match/MatchType.java
+++ b/Mage/src/mage/game/match/MatchType.java
@@ -34,7 +34,7 @@ import java.io.Serializable;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class MatchType<T extends MatchType<T>> implements Serializable {
+public abstract class MatchType implements Serializable {
 
     protected String name;
     protected int minPlayers;
@@ -56,7 +56,7 @@ public abstract class MatchType<T extends MatchType<T>> implements Serializable
         this.useAttackOption = matchType.useAttackOption;
     }
 
-    public abstract T copy();
+    public abstract MatchType copy();
 
     @Override
     public String toString() {
diff --git a/Mage/src/mage/game/tournament/TournamentType.java b/Mage/src/mage/game/tournament/TournamentType.java
index 5af9055a66..af872e3705 100644
--- a/Mage/src/mage/game/tournament/TournamentType.java
+++ b/Mage/src/mage/game/tournament/TournamentType.java
@@ -34,7 +34,7 @@ import java.io.Serializable;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class TournamentType <T extends TournamentType<T>> implements Serializable {
+public class TournamentType implements Serializable {
 
     protected String name;
     protected int minPlayers;