diff --git a/Mage.Sets/src/mage/sets/alliances/Contagion.java b/Mage.Sets/src/mage/sets/alliances/Contagion.java
index 6bd0b02d067..99d9ed6cfa0 100644
--- a/Mage.Sets/src/mage/sets/alliances/Contagion.java
+++ b/Mage.Sets/src/mage/sets/alliances/Contagion.java
@@ -86,7 +86,7 @@ public class Contagion extends CardImpl<Contagion> {
     }
 }
 
-class ContagionCounter extends BoostCounter<ContagionCounter> {
+class ContagionCounter extends BoostCounter {
 
     public ContagionCounter(int count) {
         super(-2, -1);
diff --git a/Mage.Sets/src/mage/sets/bornofthegods/ArbiterOfTheIdeal.java b/Mage.Sets/src/mage/sets/bornofthegods/ArbiterOfTheIdeal.java
index 29a5cb18d9f..3b34e254142 100644
--- a/Mage.Sets/src/mage/sets/bornofthegods/ArbiterOfTheIdeal.java
+++ b/Mage.Sets/src/mage/sets/bornofthegods/ArbiterOfTheIdeal.java
@@ -141,7 +141,7 @@ class ArbiterOfTheIdealEffect extends OneShotEffect<ArbiterOfTheIdealEffect> {
     }
 }
 
-class ManifestationCounter extends Counter<ManifestationCounter> {
+class ManifestationCounter extends Counter {
 
     public ManifestationCounter() {
         super("manifestation");
diff --git a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java
index ba84c482d78..e2586b68556 100644
--- a/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java
+++ b/Mage.Sets/src/mage/sets/championsofkamigawa/SenseiGoldenTail.java
@@ -87,7 +87,7 @@ public class SenseiGoldenTail extends CardImpl<SenseiGoldenTail> {
 }
 
 
-class TrainingCounter extends Counter<TrainingCounter> {
+class TrainingCounter extends Counter {
 
     public TrainingCounter() {
         this(1);
diff --git a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java
index a0dc846237a..d3e78b3a25f 100644
--- a/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java
+++ b/Mage.Sets/src/mage/sets/gatecrash/AssembleTheLegion.java
@@ -112,7 +112,7 @@ class AssembleTheLegionEffect extends OneShotEffect<AssembleTheLegionEffect> {
     }
 }
 
-class MusterCounter extends Counter<MusterCounter> {
+class MusterCounter extends Counter {
 
     public MusterCounter() {
        super("Muster");
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
index 880dda53d94..d538ac588ce 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
@@ -107,7 +107,7 @@ class WallOfRootsCost extends CostImpl<WallOfRootsCost> {
     }
 }
 
-class WallOfRootsCounter extends BoostCounter<WallOfRootsCounter> {
+class WallOfRootsCounter extends BoostCounter {
 
     public WallOfRootsCounter() {
         super(0, -1);
diff --git a/Mage.Sets/src/mage/sets/urzassaga/Smokestack.java b/Mage.Sets/src/mage/sets/urzassaga/Smokestack.java
index d1b9d5a9198..be2af0880ea 100644
--- a/Mage.Sets/src/mage/sets/urzassaga/Smokestack.java
+++ b/Mage.Sets/src/mage/sets/urzassaga/Smokestack.java
@@ -72,7 +72,7 @@ public class Smokestack extends CardImpl<Smokestack> {
     }
 }
 
-class SootCounter extends Counter<SootCounter> {
+class SootCounter extends Counter {
 
     public SootCounter() {
         super("soot");
diff --git a/Mage/src/mage/counters/BoostCounter.java b/Mage/src/mage/counters/BoostCounter.java
index 82fa730e012..605501218d2 100644
--- a/Mage/src/mage/counters/BoostCounter.java
+++ b/Mage/src/mage/counters/BoostCounter.java
@@ -32,7 +32,7 @@ package mage.counters;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public abstract class BoostCounter<T extends BoostCounter<T>> extends Counter<T> {
+public abstract class BoostCounter extends Counter {
 
     protected int power;
     protected int toughness;
diff --git a/Mage/src/mage/counters/Counter.java b/Mage/src/mage/counters/Counter.java
index 1d8346fb1b0..0689fe4b4df 100644
--- a/Mage/src/mage/counters/Counter.java
+++ b/Mage/src/mage/counters/Counter.java
@@ -33,9 +33,8 @@ import java.io.Serializable;
 /**
  *
  * @author BetaSteward_at_googlemail.com
- * @param <T>
  */
-public class Counter<T extends Counter<T>> implements Serializable {
+public class Counter implements Serializable {
 
     protected String name;
     protected int count;
@@ -86,7 +85,7 @@ public class Counter<T extends Counter<T>> implements Serializable {
         return count;
     }
 
-    public T copy() {
-        return (T)new Counter(this);
+    public Counter copy() {
+        return new Counter(this);
     }
 }
diff --git a/Mage/src/mage/counters/common/AgeCounter.java b/Mage/src/mage/counters/common/AgeCounter.java
index bffb4cb365c..427ebdb4f37 100644
--- a/Mage/src/mage/counters/common/AgeCounter.java
+++ b/Mage/src/mage/counters/common/AgeCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author Plopman
  */
-public class AgeCounter extends Counter<AgeCounter> {
+public class AgeCounter extends Counter {
 
     public AgeCounter() {
         super("age");
diff --git a/Mage/src/mage/counters/common/AimCounter.java b/Mage/src/mage/counters/common/AimCounter.java
index a4d188a05ec..066987dc0dd 100644
--- a/Mage/src/mage/counters/common/AimCounter.java
+++ b/Mage/src/mage/counters/common/AimCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author LevelX
  */
-public class AimCounter extends Counter<AimCounter> {
+public class AimCounter extends Counter {
 
     public AimCounter() {
         super("aim");
diff --git a/Mage/src/mage/counters/common/ArrowheadCounter.java b/Mage/src/mage/counters/common/ArrowheadCounter.java
index b44f79028dd..dee758d1559 100644
--- a/Mage/src/mage/counters/common/ArrowheadCounter.java
+++ b/Mage/src/mage/counters/common/ArrowheadCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class ArrowheadCounter extends Counter<ArrowheadCounter> {
+public class ArrowheadCounter extends Counter {
 
     public ArrowheadCounter() {
         super("arrowhead");
diff --git a/Mage/src/mage/counters/common/AwakeningCounter.java b/Mage/src/mage/counters/common/AwakeningCounter.java
index bf910837ce7..7cf0116fcb9 100644
--- a/Mage/src/mage/counters/common/AwakeningCounter.java
+++ b/Mage/src/mage/counters/common/AwakeningCounter.java
@@ -2,7 +2,7 @@ package mage.counters.common;
 
 import mage.counters.Counter;
 
-public class AwakeningCounter extends Counter<AwakeningCounter> {
+public class AwakeningCounter extends Counter {
     public AwakeningCounter() {
         this(1);
     }
diff --git a/Mage/src/mage/counters/common/BlazeCounter.java b/Mage/src/mage/counters/common/BlazeCounter.java
index a83711625f5..ea8937a5c13 100644
--- a/Mage/src/mage/counters/common/BlazeCounter.java
+++ b/Mage/src/mage/counters/common/BlazeCounter.java
@@ -2,7 +2,7 @@ package mage.counters.common;
 
 import mage.counters.Counter;
 
-public class BlazeCounter extends Counter<BlazeCounter> {
+public class BlazeCounter extends Counter {
     public BlazeCounter() {
         this(1);
     }
diff --git a/Mage/src/mage/counters/common/BriberyCounter.java b/Mage/src/mage/counters/common/BriberyCounter.java
index 5d4ff2e33f9..0be629ad2ce 100644
--- a/Mage/src/mage/counters/common/BriberyCounter.java
+++ b/Mage/src/mage/counters/common/BriberyCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author jeffwadsworth
  */
-public class BriberyCounter extends Counter<BriberyCounter> {
+public class BriberyCounter extends Counter {
 
     public BriberyCounter() {
         super("bribery");
diff --git a/Mage/src/mage/counters/common/ChargeCounter.java b/Mage/src/mage/counters/common/ChargeCounter.java
index 474355e52a2..6afee486ec1 100644
--- a/Mage/src/mage/counters/common/ChargeCounter.java
+++ b/Mage/src/mage/counters/common/ChargeCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class ChargeCounter extends Counter<ChargeCounter> {
+public class ChargeCounter extends Counter {
 
     public ChargeCounter() {
         super("Charge");
diff --git a/Mage/src/mage/counters/common/DepletionCounter.java b/Mage/src/mage/counters/common/DepletionCounter.java
index f5d134f8360..c65a5cd52ec 100644
--- a/Mage/src/mage/counters/common/DepletionCounter.java
+++ b/Mage/src/mage/counters/common/DepletionCounter.java
@@ -12,7 +12,7 @@ import mage.counters.Counter;
  *
  * @author Plopman
  */
-public class DepletionCounter extends Counter<DepletionCounter> {
+public class DepletionCounter extends Counter {
 
     public DepletionCounter() {
         super("Depletion");
diff --git a/Mage/src/mage/counters/common/DespairCounter.java b/Mage/src/mage/counters/common/DespairCounter.java
index 5f74d9cedfe..eca782288e4 100644
--- a/Mage/src/mage/counters/common/DespairCounter.java
+++ b/Mage/src/mage/counters/common/DespairCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author noxx
  */
-public class DespairCounter extends Counter<DespairCounter> {
+public class DespairCounter extends Counter {
 
     public DespairCounter() {
         super("Despair");
diff --git a/Mage/src/mage/counters/common/DevotionCounter.java b/Mage/src/mage/counters/common/DevotionCounter.java
index 96899ada831..cb693cabfb6 100644
--- a/Mage/src/mage/counters/common/DevotionCounter.java
+++ b/Mage/src/mage/counters/common/DevotionCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author Loki
  */
-public class DevotionCounter extends Counter<DevotionCounter> {
+public class DevotionCounter extends Counter {
 
     public DevotionCounter() {
         super("Devotion");
diff --git a/Mage/src/mage/counters/common/DivinityCounter.java b/Mage/src/mage/counters/common/DivinityCounter.java
index 851c1522f58..f27748cde13 100644
--- a/Mage/src/mage/counters/common/DivinityCounter.java
+++ b/Mage/src/mage/counters/common/DivinityCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author Loki
  */
-public class DivinityCounter extends Counter<DivinityCounter> {
+public class DivinityCounter extends Counter {
 
     public DivinityCounter() {
         super("Divinity");
diff --git a/Mage/src/mage/counters/common/DoomCounter.java b/Mage/src/mage/counters/common/DoomCounter.java
index 369c36fa749..83e54d338a3 100644
--- a/Mage/src/mage/counters/common/DoomCounter.java
+++ b/Mage/src/mage/counters/common/DoomCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  * @author LevelX2
  */
 
-public class DoomCounter extends Counter<DoomCounter> {
+public class DoomCounter extends Counter {
 
     public DoomCounter() {
         this(1);
diff --git a/Mage/src/mage/counters/common/ElixirCounter.java b/Mage/src/mage/counters/common/ElixirCounter.java
index b31fb6df46d..f5c235b13cd 100644
--- a/Mage/src/mage/counters/common/ElixirCounter.java
+++ b/Mage/src/mage/counters/common/ElixirCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author North
  */
-public class ElixirCounter extends Counter<ElixirCounter> {
+public class ElixirCounter extends Counter {
 
     public ElixirCounter() {
         super("Elixir");
diff --git a/Mage/src/mage/counters/common/EonCounter.java b/Mage/src/mage/counters/common/EonCounter.java
index fb3df296712..dc1cef99d61 100644
--- a/Mage/src/mage/counters/common/EonCounter.java
+++ b/Mage/src/mage/counters/common/EonCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class EonCounter extends Counter<EonCounter> {
+public class EonCounter extends Counter {
 
     public EonCounter() {
         super("Eon");
diff --git a/Mage/src/mage/counters/common/EyeballCounter.java b/Mage/src/mage/counters/common/EyeballCounter.java
index a0949d85dd3..21b9d9a068f 100644
--- a/Mage/src/mage/counters/common/EyeballCounter.java
+++ b/Mage/src/mage/counters/common/EyeballCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author North
  */
-public class EyeballCounter  extends Counter<EyeballCounter> {
+public class EyeballCounter  extends Counter {
 
     public EyeballCounter() {
         super("Eyeball");
diff --git a/Mage/src/mage/counters/common/FadeCounter.java b/Mage/src/mage/counters/common/FadeCounter.java
index 5684054fb05..fc2129dd767 100644
--- a/Mage/src/mage/counters/common/FadeCounter.java
+++ b/Mage/src/mage/counters/common/FadeCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class FadeCounter extends Counter<FadeCounter> {
+public class FadeCounter extends Counter {
 
     public FadeCounter() {
         super("Fade");
diff --git a/Mage/src/mage/counters/common/FateCounter.java b/Mage/src/mage/counters/common/FateCounter.java
index 7cb8a24476d..56ed0a6e560 100644
--- a/Mage/src/mage/counters/common/FateCounter.java
+++ b/Mage/src/mage/counters/common/FateCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class FateCounter extends Counter<FateCounter> {
+public class FateCounter extends Counter {
 
     public FateCounter() {
         super("Fate");
diff --git a/Mage/src/mage/counters/common/FeatherCounter.java b/Mage/src/mage/counters/common/FeatherCounter.java
index 3face1d12e3..16224f9dd5b 100644
--- a/Mage/src/mage/counters/common/FeatherCounter.java
+++ b/Mage/src/mage/counters/common/FeatherCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class FeatherCounter extends Counter<FeatherCounter> {
+public class FeatherCounter extends Counter {
 
     public FeatherCounter() {
         super("Feather");
diff --git a/Mage/src/mage/counters/common/FuseCounter.java b/Mage/src/mage/counters/common/FuseCounter.java
index dd26278034d..25d63bf25b8 100644
--- a/Mage/src/mage/counters/common/FuseCounter.java
+++ b/Mage/src/mage/counters/common/FuseCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author LevelX2
  */
-public class FuseCounter extends Counter<FuseCounter> {
+public class FuseCounter extends Counter {
 
     public FuseCounter() {
         super("fuse");
diff --git a/Mage/src/mage/counters/common/HatchlingCounter.java b/Mage/src/mage/counters/common/HatchlingCounter.java
index 5df9cc80482..7a39bcce664 100644
--- a/Mage/src/mage/counters/common/HatchlingCounter.java
+++ b/Mage/src/mage/counters/common/HatchlingCounter.java
@@ -6,7 +6,7 @@ import mage.counters.Counter;
  * Hatchling counter
  * @author Loki
  */
-public class HatchlingCounter extends Counter<HatchlingCounter> {
+public class HatchlingCounter extends Counter {
     public HatchlingCounter() {
         super("Hatchling");
         this.count = 1;
diff --git a/Mage/src/mage/counters/common/HoofprintCounter.java b/Mage/src/mage/counters/common/HoofprintCounter.java
index 15d52d86362..f976112d7e3 100644
--- a/Mage/src/mage/counters/common/HoofprintCounter.java
+++ b/Mage/src/mage/counters/common/HoofprintCounter.java
@@ -5,7 +5,7 @@ import mage.counters.Counter;
 /**
  * @author Loki
  */
-public class HoofprintCounter extends Counter<HoofprintCounter> {
+public class HoofprintCounter extends Counter {
 
     public HoofprintCounter() {
         super("Hoofprint");
diff --git a/Mage/src/mage/counters/common/IceCounter.java b/Mage/src/mage/counters/common/IceCounter.java
index f74c9441b6d..4c078d44da3 100644
--- a/Mage/src/mage/counters/common/IceCounter.java
+++ b/Mage/src/mage/counters/common/IceCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author Plopman
  */
-public class IceCounter extends Counter<IceCounter> {
+public class IceCounter extends Counter {
 
     public IceCounter() {
         super("Ice");
diff --git a/Mage/src/mage/counters/common/KiCounter.java b/Mage/src/mage/counters/common/KiCounter.java
index 1689ca9dad5..66da7f756e2 100644
--- a/Mage/src/mage/counters/common/KiCounter.java
+++ b/Mage/src/mage/counters/common/KiCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author Loki
  */
-public class KiCounter extends Counter<KiCounter> {
+public class KiCounter extends Counter {
 
     public KiCounter() {
         super("Ki");
diff --git a/Mage/src/mage/counters/common/LevelCounter.java b/Mage/src/mage/counters/common/LevelCounter.java
index 16282b063c7..f589b0c6a2a 100644
--- a/Mage/src/mage/counters/common/LevelCounter.java
+++ b/Mage/src/mage/counters/common/LevelCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class LevelCounter extends Counter<LevelCounter> {
+public class LevelCounter extends Counter {
 
     public LevelCounter() {
         super("Level");
diff --git a/Mage/src/mage/counters/common/LoreCounter.java b/Mage/src/mage/counters/common/LoreCounter.java
index 6c49f9cbe1a..a1544777fd7 100644
--- a/Mage/src/mage/counters/common/LoreCounter.java
+++ b/Mage/src/mage/counters/common/LoreCounter.java
@@ -5,7 +5,7 @@ import mage.counters.Counter;
 /**
  * Lore counter
  */
-public class LoreCounter extends Counter<LoreCounter> {
+public class LoreCounter extends Counter {
     public LoreCounter() {
         super("Lore");
         this.count = 1;
diff --git a/Mage/src/mage/counters/common/LoyaltyCounter.java b/Mage/src/mage/counters/common/LoyaltyCounter.java
index 2b0b062b24f..09385b6c58d 100644
--- a/Mage/src/mage/counters/common/LoyaltyCounter.java
+++ b/Mage/src/mage/counters/common/LoyaltyCounter.java
@@ -41,7 +41,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class LoyaltyCounter extends Counter<LoyaltyCounter> {
+public class LoyaltyCounter extends Counter {
 
     public LoyaltyCounter() {
         super("Loyalty");
diff --git a/Mage/src/mage/counters/common/MiningCounter.java b/Mage/src/mage/counters/common/MiningCounter.java
index 7f7bd280645..6e9496db65b 100644
--- a/Mage/src/mage/counters/common/MiningCounter.java
+++ b/Mage/src/mage/counters/common/MiningCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author jeff
  */
-public class MiningCounter extends Counter<MiningCounter> {
+public class MiningCounter extends Counter {
 
     public MiningCounter() {
         super("mining");
diff --git a/Mage/src/mage/counters/common/MinusOneCounter.java b/Mage/src/mage/counters/common/MinusOneCounter.java
index 83a4d522390..7c8e3682aa2 100644
--- a/Mage/src/mage/counters/common/MinusOneCounter.java
+++ b/Mage/src/mage/counters/common/MinusOneCounter.java
@@ -34,7 +34,7 @@ import mage.counters.BoostCounter;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class MinusOneCounter extends BoostCounter<MinusOneCounter> {
+public class MinusOneCounter extends BoostCounter {
 
     public MinusOneCounter() {
         super(-1, -1);
diff --git a/Mage/src/mage/counters/common/PageCounter.java b/Mage/src/mage/counters/common/PageCounter.java
index e6227ff4125..fc9a8837808 100644
--- a/Mage/src/mage/counters/common/PageCounter.java
+++ b/Mage/src/mage/counters/common/PageCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author Backfir3
  */
-public class PageCounter extends Counter<PageCounter> {
+public class PageCounter extends Counter {
 
     public PageCounter() {
         super("Page");
diff --git a/Mage/src/mage/counters/common/PainCounter.java b/Mage/src/mage/counters/common/PainCounter.java
index e3f9f4809a5..6687fdb4811 100644
--- a/Mage/src/mage/counters/common/PainCounter.java
+++ b/Mage/src/mage/counters/common/PainCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author North
  */
-public class PainCounter extends Counter<PainCounter> {
+public class PainCounter extends Counter {
 
     public PainCounter() {
         super("Pain");
diff --git a/Mage/src/mage/counters/common/PetrificationCounter.java b/Mage/src/mage/counters/common/PetrificationCounter.java
index 39c68d5daaa..6acb0d477d6 100644
--- a/Mage/src/mage/counters/common/PetrificationCounter.java
+++ b/Mage/src/mage/counters/common/PetrificationCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author jeff
  */
-public class PetrificationCounter extends Counter<PetrificationCounter> {
+public class PetrificationCounter extends Counter {
 
     public PetrificationCounter() {
         super("petrification");
diff --git a/Mage/src/mage/counters/common/PlagueCounter.java b/Mage/src/mage/counters/common/PlagueCounter.java
index 11c97d6a66d..c8f3008b4e1 100644
--- a/Mage/src/mage/counters/common/PlagueCounter.java
+++ b/Mage/src/mage/counters/common/PlagueCounter.java
@@ -34,7 +34,7 @@ import mage.counters.Counter;
  * @author LevelX2
  */
 
-public class PlagueCounter extends Counter<PlagueCounter> {
+public class PlagueCounter extends Counter {
 
     public PlagueCounter() {
         super("plague");
diff --git a/Mage/src/mage/counters/common/PlusOneCounter.java b/Mage/src/mage/counters/common/PlusOneCounter.java
index bd468eac5a8..bef4e266f18 100644
--- a/Mage/src/mage/counters/common/PlusOneCounter.java
+++ b/Mage/src/mage/counters/common/PlusOneCounter.java
@@ -34,7 +34,7 @@ import mage.counters.BoostCounter;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class PlusOneCounter extends BoostCounter<PlusOneCounter> {
+public class PlusOneCounter extends BoostCounter {
 
     public PlusOneCounter() {
         this(1);
diff --git a/Mage/src/mage/counters/common/PoisonCounter.java b/Mage/src/mage/counters/common/PoisonCounter.java
index 70e3a22740a..591a866207c 100644
--- a/Mage/src/mage/counters/common/PoisonCounter.java
+++ b/Mage/src/mage/counters/common/PoisonCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class PoisonCounter extends Counter<PoisonCounter> {
+public class PoisonCounter extends Counter {
 
     public PoisonCounter() {
         super("Poison");
diff --git a/Mage/src/mage/counters/common/PressureCounter.java b/Mage/src/mage/counters/common/PressureCounter.java
index 2769e21c4bc..b8e1b4fca2c 100644
--- a/Mage/src/mage/counters/common/PressureCounter.java
+++ b/Mage/src/mage/counters/common/PressureCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author jeff
  */
-public class PressureCounter extends Counter<PressureCounter> {
+public class PressureCounter extends Counter {
 
     public PressureCounter() {
         super("pressure");
diff --git a/Mage/src/mage/counters/common/QuestCounter.java b/Mage/src/mage/counters/common/QuestCounter.java
index 18c3dc0dd95..6f253a1eb04 100644
--- a/Mage/src/mage/counters/common/QuestCounter.java
+++ b/Mage/src/mage/counters/common/QuestCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class QuestCounter extends Counter<QuestCounter> {
+public class QuestCounter extends Counter {
 
     public QuestCounter() {
         super("Quest");
diff --git a/Mage/src/mage/counters/common/SlimeCounter.java b/Mage/src/mage/counters/common/SlimeCounter.java
index 65a3065c82d..cffb9c6e1b4 100644
--- a/Mage/src/mage/counters/common/SlimeCounter.java
+++ b/Mage/src/mage/counters/common/SlimeCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class SlimeCounter extends Counter<SlimeCounter> {
+public class SlimeCounter extends Counter {
 
     public SlimeCounter() {
         this(1);
diff --git a/Mage/src/mage/counters/common/SporeCounter.java b/Mage/src/mage/counters/common/SporeCounter.java
index 381266c33ec..765bd310c6c 100644
--- a/Mage/src/mage/counters/common/SporeCounter.java
+++ b/Mage/src/mage/counters/common/SporeCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author Loki
  */
-public class SporeCounter extends Counter<SporeCounter> {
+public class SporeCounter extends Counter {
 
     public SporeCounter() {
         super("Spore");
diff --git a/Mage/src/mage/counters/common/StorageCounter.java b/Mage/src/mage/counters/common/StorageCounter.java
index 8aa13171dc6..ba2547acd3b 100644
--- a/Mage/src/mage/counters/common/StorageCounter.java
+++ b/Mage/src/mage/counters/common/StorageCounter.java
@@ -34,7 +34,7 @@ import mage.counters.Counter;
  *
  * @author LevelX2
  */
-public class StorageCounter extends Counter<SlimeCounter> {
+public class StorageCounter extends Counter {
 
     public StorageCounter() {
         this(1);
diff --git a/Mage/src/mage/counters/common/StudyCounter.java b/Mage/src/mage/counters/common/StudyCounter.java
index 0b31b798933..c2840277c29 100644
--- a/Mage/src/mage/counters/common/StudyCounter.java
+++ b/Mage/src/mage/counters/common/StudyCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author BetaSteward_at_googlemail.com
  */
-public class StudyCounter extends Counter<StudyCounter> {
+public class StudyCounter extends Counter {
 
     public StudyCounter() {
         this(1);
diff --git a/Mage/src/mage/counters/common/TheftCounter.java b/Mage/src/mage/counters/common/TheftCounter.java
index 2d4cbf6c440..d5ca2c0d7d4 100644
--- a/Mage/src/mage/counters/common/TheftCounter.java
+++ b/Mage/src/mage/counters/common/TheftCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author LevelX2
  */
-public class TheftCounter  extends Counter<TheftCounter> {
+public class TheftCounter  extends Counter {
 
     public TheftCounter() {
         super("Theft");
diff --git a/Mage/src/mage/counters/common/TimeCounter.java b/Mage/src/mage/counters/common/TimeCounter.java
index 040294a7522..b43431f1aa4 100644
--- a/Mage/src/mage/counters/common/TimeCounter.java
+++ b/Mage/src/mage/counters/common/TimeCounter.java
@@ -35,7 +35,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class TimeCounter extends Counter<TimeCounter> {
+public class TimeCounter extends Counter {
 
     public TimeCounter() {
         super("Time");
diff --git a/Mage/src/mage/counters/common/TowerCounter.java b/Mage/src/mage/counters/common/TowerCounter.java
index 97b00b33b14..8efb954b538 100644
--- a/Mage/src/mage/counters/common/TowerCounter.java
+++ b/Mage/src/mage/counters/common/TowerCounter.java
@@ -33,7 +33,7 @@ import mage.counters.Counter;
  *
  * @author jeffwadsworth
  */
-public class TowerCounter extends Counter<TowerCounter> {
+public class TowerCounter extends Counter {
 
     public TowerCounter() {
         super("Tower");
diff --git a/Mage/src/mage/counters/common/VileCounter.java b/Mage/src/mage/counters/common/VileCounter.java
index b922334050d..b957d98d046 100644
--- a/Mage/src/mage/counters/common/VileCounter.java
+++ b/Mage/src/mage/counters/common/VileCounter.java
@@ -34,7 +34,7 @@ import mage.counters.Counter;
  * @author LevelX2
  */
 
-public class VileCounter extends Counter<VileCounter> {
+public class VileCounter extends Counter {
 
     public VileCounter() {
         super("vile");
diff --git a/Mage/src/mage/counters/common/WishCounter.java b/Mage/src/mage/counters/common/WishCounter.java
index 03589d3f1df..a92023ef8e6 100644
--- a/Mage/src/mage/counters/common/WishCounter.java
+++ b/Mage/src/mage/counters/common/WishCounter.java
@@ -7,7 +7,7 @@ import mage.counters.Counter;
  *
  * @author nantuko
  */
-public class WishCounter extends Counter<WishCounter> {
+public class WishCounter extends Counter {
 
     public WishCounter() {
         super("Wish");