diff --git a/Mage/src/mage/game/turn/BeginCombatStep.java b/Mage/src/mage/game/turn/BeginCombatStep.java
index 2f5d739e13c..5669e740f65 100644
--- a/Mage/src/mage/game/turn/BeginCombatStep.java
+++ b/Mage/src/mage/game/turn/BeginCombatStep.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class BeginCombatStep extends Step<BeginCombatStep> {
+public class BeginCombatStep extends Step {
 
     public BeginCombatStep() {
         super(PhaseStep.BEGIN_COMBAT, true);
diff --git a/Mage/src/mage/game/turn/CleanupStep.java b/Mage/src/mage/game/turn/CleanupStep.java
index a0a3b37a38a..14d9c3d1cb5 100644
--- a/Mage/src/mage/game/turn/CleanupStep.java
+++ b/Mage/src/mage/game/turn/CleanupStep.java
@@ -38,7 +38,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CleanupStep extends Step<CleanupStep> {
+public class CleanupStep extends Step {
 
     public CleanupStep() {
         super(PhaseStep.CLEANUP, true);
diff --git a/Mage/src/mage/game/turn/CombatDamageStep.java b/Mage/src/mage/game/turn/CombatDamageStep.java
index 9b1c48aa87f..65f03ecdcba 100644
--- a/Mage/src/mage/game/turn/CombatDamageStep.java
+++ b/Mage/src/mage/game/turn/CombatDamageStep.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class CombatDamageStep extends Step<CombatDamageStep> {
+public class CombatDamageStep extends Step {
 
     public CombatDamageStep() {
         super(PhaseStep.COMBAT_DAMAGE, true);
diff --git a/Mage/src/mage/game/turn/DeclareAttackersStep.java b/Mage/src/mage/game/turn/DeclareAttackersStep.java
index f5a00ad907e..e52863c128e 100644
--- a/Mage/src/mage/game/turn/DeclareAttackersStep.java
+++ b/Mage/src/mage/game/turn/DeclareAttackersStep.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DeclareAttackersStep extends Step<DeclareAttackersStep> {
+public class DeclareAttackersStep extends Step {
 
     public DeclareAttackersStep() {
         super(PhaseStep.DECLARE_ATTACKERS, true);
diff --git a/Mage/src/mage/game/turn/DeclareBlockersStep.java b/Mage/src/mage/game/turn/DeclareBlockersStep.java
index 7d1f4e5a93f..6343853aa58 100644
--- a/Mage/src/mage/game/turn/DeclareBlockersStep.java
+++ b/Mage/src/mage/game/turn/DeclareBlockersStep.java
@@ -38,7 +38,7 @@ import java.util.UUID;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DeclareBlockersStep extends Step<DeclareBlockersStep> {
+public class DeclareBlockersStep extends Step {
 
     public DeclareBlockersStep() {
         super(PhaseStep.DECLARE_BLOCKERS, true);
diff --git a/Mage/src/mage/game/turn/DrawStep.java b/Mage/src/mage/game/turn/DrawStep.java
index a8100515c58..a180acbe261 100644
--- a/Mage/src/mage/game/turn/DrawStep.java
+++ b/Mage/src/mage/game/turn/DrawStep.java
@@ -38,7 +38,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class DrawStep extends Step<DrawStep> {
+public class DrawStep extends Step {
 
     public DrawStep() {
         super(PhaseStep.DRAW, true);
diff --git a/Mage/src/mage/game/turn/EndOfCombatStep.java b/Mage/src/mage/game/turn/EndOfCombatStep.java
index eef63a56a94..f2582d6f66f 100644
--- a/Mage/src/mage/game/turn/EndOfCombatStep.java
+++ b/Mage/src/mage/game/turn/EndOfCombatStep.java
@@ -37,7 +37,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EndOfCombatStep extends Step<EndOfCombatStep> {
+public class EndOfCombatStep extends Step {
 
     public EndOfCombatStep() {
         super(PhaseStep.END_COMBAT, true);
diff --git a/Mage/src/mage/game/turn/EndStep.java b/Mage/src/mage/game/turn/EndStep.java
index a6a4811c319..5ba5c8aafa0 100644
--- a/Mage/src/mage/game/turn/EndStep.java
+++ b/Mage/src/mage/game/turn/EndStep.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class EndStep extends Step<EndStep> {
+public class EndStep extends Step {
 
     public EndStep() {
         super(PhaseStep.END_TURN, true);
diff --git a/Mage/src/mage/game/turn/FirstCombatDamageStep.java b/Mage/src/mage/game/turn/FirstCombatDamageStep.java
index 8cd5959e67c..135284f272e 100644
--- a/Mage/src/mage/game/turn/FirstCombatDamageStep.java
+++ b/Mage/src/mage/game/turn/FirstCombatDamageStep.java
@@ -38,7 +38,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class FirstCombatDamageStep extends Step<FirstCombatDamageStep> {
+public class FirstCombatDamageStep extends Step {
 
     public FirstCombatDamageStep() {
         super(PhaseStep.FIRST_COMBAT_DAMAGE, true);
diff --git a/Mage/src/mage/game/turn/PostCombatMainStep.java b/Mage/src/mage/game/turn/PostCombatMainStep.java
index 6b9e81f73e7..e8ec52656a9 100644
--- a/Mage/src/mage/game/turn/PostCombatMainStep.java
+++ b/Mage/src/mage/game/turn/PostCombatMainStep.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PostCombatMainStep extends Step<PostCombatMainStep> {
+public class PostCombatMainStep extends Step {
 
     public PostCombatMainStep() {
         super(PhaseStep.POSTCOMBAT_MAIN, true);
diff --git a/Mage/src/mage/game/turn/PreCombatMainStep.java b/Mage/src/mage/game/turn/PreCombatMainStep.java
index ca5455a7880..a3a8ba12e5b 100644
--- a/Mage/src/mage/game/turn/PreCombatMainStep.java
+++ b/Mage/src/mage/game/turn/PreCombatMainStep.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PreCombatMainStep extends Step<PreCombatMainStep> {
+public class PreCombatMainStep extends Step {
 
     public PreCombatMainStep() {
         super(PhaseStep.PRECOMBAT_MAIN, true);
diff --git a/Mage/src/mage/game/turn/Step.java b/Mage/src/mage/game/turn/Step.java
index 6e1bf500ac2..19414ee7edd 100644
--- a/Mage/src/mage/game/turn/Step.java
+++ b/Mage/src/mage/game/turn/Step.java
@@ -38,9 +38,8 @@ import mage.game.events.GameEvent.EventType;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public abstract class Step<T extends Step<T>> implements Serializable {
+public abstract class Step implements Serializable {
 
     private final PhaseStep type;
     private final boolean hasPriority;
@@ -53,7 +52,7 @@ public abstract class Step<T extends Step<T>> implements Serializable {
         PRE, PRIORITY, POST;
     }
 
-    public abstract T copy();
+    public abstract Step copy();
 
     public Step(PhaseStep type, boolean hasPriority) {
         this.type = type;
diff --git a/Mage/src/mage/game/turn/UntapStep.java b/Mage/src/mage/game/turn/UntapStep.java
index a17d8371d70..dc500a470ae 100644
--- a/Mage/src/mage/game/turn/UntapStep.java
+++ b/Mage/src/mage/game/turn/UntapStep.java
@@ -38,7 +38,7 @@ import mage.players.Player;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class UntapStep extends Step<UntapStep> {
+public class UntapStep extends Step {
 
     public UntapStep() {
         super(PhaseStep.UNTAP, false);
diff --git a/Mage/src/mage/game/turn/UpkeepStep.java b/Mage/src/mage/game/turn/UpkeepStep.java
index 5d93043e50d..277255cb5f3 100644
--- a/Mage/src/mage/game/turn/UpkeepStep.java
+++ b/Mage/src/mage/game/turn/UpkeepStep.java
@@ -35,7 +35,7 @@ import mage.game.events.GameEvent.EventType;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class UpkeepStep extends Step<UpkeepStep> {
+public class UpkeepStep extends Step {
 
     public UpkeepStep() {
         super(PhaseStep.UPKEEP, true);