diff --git a/Mage.Client/src/main/java/mage/client/components/ColorPane.java b/Mage.Client/src/main/java/mage/client/components/ColorPane.java
index 3815b99d2d8..b39562180a2 100644
--- a/Mage.Client/src/main/java/mage/client/components/ColorPane.java
+++ b/Mage.Client/src/main/java/mage/client/components/ColorPane.java
@@ -145,7 +145,7 @@ public class ColorPane extends JEditorPane {
 
     @Override
     public void setText(String string) {
-        super.setText(string); //To change body of generated methods, choose Tools | Templates.
+        super.setText(string);
     }
 
     public void append(String text) {
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
index 1bdeafa67ad..be899d4d037 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
@@ -447,7 +447,7 @@ public class TableModel extends AbstractTableModel implements ICardGrid {
         if (numberEditable && col == 0) {
             return true;
         }
-        return super.isCellEditable(row, col); //To change body of generated methods, choose Tools | Templates.
+        return super.isCellEditable(row, col);
     }
 
 }
diff --git a/Mage.Client/src/main/java/mage/client/draft/DraftPane.java b/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
index 5e58b425604..ad9a77b28de 100644
--- a/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
+++ b/Mage.Client/src/main/java/mage/client/draft/DraftPane.java
@@ -39,7 +39,7 @@ public class DraftPane extends MagePane {
 
     @Override
     public void changeGUISize() {
-        super.changeGUISize(); //To change body of generated methods, choose Tools | Templates.
+        super.changeGUISize();
         draftPanel1.changeGUISize();
     }
 
diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
index 292d5cd8243..be2eca735a8 100644
--- a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
@@ -304,7 +304,7 @@ public class CountryComboBox extends JComboBox {
 
     @Override
     public Object getSelectedItem() {
-        return super.getSelectedItem(); //To change body of generated methods, choose Tools | Templates.
+        return super.getSelectedItem();
     }
 
 }
diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
index 06b1eb8ac59..ad32ca8fa48 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
@@ -2874,7 +2874,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
 
     @Override
     public void cleanUpOnMatchEnd() {
-        super.cleanUpOnMatchEnd(); //To change body of generated methods, choose Tools | Templates.
+        super.cleanUpOnMatchEnd();
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/n/NewBlood.java b/Mage.Sets/src/mage/cards/n/NewBlood.java
index 91ef7a5f853..6cef3a8da62 100644
--- a/Mage.Sets/src/mage/cards/n/NewBlood.java
+++ b/Mage.Sets/src/mage/cards/n/NewBlood.java
@@ -127,7 +127,7 @@ class ChangeCreatureTypeTargetEffect extends ContinuousEffectImpl {
             }
         }
 
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java
index 0195ee0ac1e..9eaef7ebb19 100644
--- a/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java
+++ b/Mage.Sets/src/mage/cards/o/OpportunisticDragon.java
@@ -140,6 +140,6 @@ class OpportunisticDragonAttackBlockEffect extends CantAttackBlockTargetEffect {
             discard();
             return false;
         }
-        return super.applies(permanent, source, game); //To change body of generated methods, choose Tools | Templates.
+        return super.applies(permanent, source, game);
     }
 }
diff --git a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java
index 8930a92e5e2..a6752fb7ff4 100644
--- a/Mage.Sets/src/mage/cards/s/SirenStormtamer.java
+++ b/Mage.Sets/src/mage/cards/s/SirenStormtamer.java
@@ -153,6 +153,6 @@ class SirenStormtamerTargetObject extends TargetObject {
 
     @Override
     public Filter getFilter() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
index 9120dd7023e..6c8790e67b0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
+++ b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java
@@ -1386,12 +1386,12 @@ public class PlayerStub implements Player {
 
     @Override
     public PlanarDieRollResult rollPlanarDie(Outcome outcome, Ability source, Game game, int numberChaosSides, int numberPlanarSides) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
     public List<UUID> getTurnControllers() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/TournamentStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/TournamentStub.java
index 407ef8b91a6..4ae9d7a69a0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/stub/TournamentStub.java
+++ b/Mage.Tests/src/test/java/org/mage/test/stub/TournamentStub.java
@@ -46,7 +46,7 @@ public class TournamentStub implements Tournament {
 
     @Override
     public ResultProtos.TourneyProto toProto() {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
index 1ef9bdbb446..00f553952b9 100644
--- a/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
+++ b/Mage/src/main/java/mage/abilities/decorator/ConditionalContinuousRuleModifyingEffect.java
@@ -111,17 +111,17 @@ public class ConditionalContinuousRuleModifyingEffect extends ContinuousRuleModi
 
     @Override
     public boolean sendMessageToGameLog() {
-        return effect.sendMessageToGameLog(); //To change body of generated methods, choose Tools | Templates.
+        return effect.sendMessageToGameLog();
     }
 
     @Override
     public boolean sendMessageToUser() {
-        return effect.sendMessageToUser(); //To change body of generated methods, choose Tools | Templates.
+        return effect.sendMessageToUser();
     }
 
     @Override
     public String getInfoMessage(Ability source, GameEvent event, Game game) {
-        return effect.getInfoMessage(source, event, game); //To change body of generated methods, choose Tools | Templates.
+        return effect.getInfoMessage(source, event, game);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java
index aa708fccac0..e2e9a5f8860 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/CantBeRegeneratedSourceEffect.java
@@ -43,7 +43,7 @@ public class CantBeRegeneratedSourceEffect extends ContinuousRuleModifyingEffect
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
index 87b634bbcd5..e03d3a82369 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PreventDamageToSourceEffect.java
@@ -28,7 +28,7 @@ public class PreventDamageToSourceEffect extends PreventionEffectImpl {
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
index 35b1e8ab14f..9bd3be20097 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BecomesColorTargetEffect.java
@@ -95,7 +95,7 @@ public class BecomesColorTargetEffect extends ContinuousEffectImpl {
             }
         }
 
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java
index 1888bb8a5a7..f5ea7255ca0 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/GainProtectionFromColorTargetEffect.java
@@ -45,7 +45,7 @@ public class GainProtectionFromColorTargetEffect extends GainAbilityTargetEffect
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         MageObject sourceObject = game.getObject(source);
         Player controller = game.getPlayer(source.getControllerId());
         if (sourceObject != null && controller != null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java
index 6f003ea848b..5b13abf14a9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java
@@ -38,7 +38,7 @@ public class LoseAbilitySourceEffect extends ContinuousEffectImpl {
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java
index 594d62bd1fd..08af68fd1f7 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseArtifactTypeTargetEffect.java
@@ -30,7 +30,7 @@ public class LoseArtifactTypeTargetEffect extends ContinuousEffectImpl {
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java
index f2dc1063749..c8f0efbfb39 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java
@@ -43,7 +43,7 @@ public class LoseCreatureTypeSourceEffect extends ContinuousEffectImpl {
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); //To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java
index 1ce21c4d1e8..38825a252f5 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/SwitchPowerToughnessSourceEffect.java
@@ -31,7 +31,7 @@ public class SwitchPowerToughnessSourceEffect extends ContinuousEffectImpl {
 
     @Override
     public void init(Ability source, Game game) {
-        super.init(source, game); // To change body of generated methods, choose Tools | Templates.
+        super.init(source, game);
         if (duration.isOnlyValidIfNoZoneChange()) {
             // If source permanent is no longer onto battlefield discard the effect
             if (source.getSourcePermanentIfItStillExists(game) == null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
index 774b46b5785..d3c9403c1f5 100644
--- a/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/mana/AddConditionalManaEffect.java
@@ -59,7 +59,7 @@ public class AddConditionalManaEffect extends ManaEffect {
             }
             return maxAvailableMana;
         }
-        return super.getNetMana(game, source); //To change body of generated methods, choose Tools | Templates.
+        return super.getNetMana(game, source);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
index a4d72d2ee41..c1b08e6947e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SoulshiftAbility.java
@@ -53,7 +53,7 @@ public class SoulshiftAbility extends DiesSourceTriggeredAbility {
         filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, intValue + 1));
         filter.add(SubType.SPIRIT.getPredicate());
         this.addTarget(new TargetCardInYourGraveyard(filter));
-        super.trigger(game, controllerId, triggeringEvent); //To change body of generated methods, choose Tools | Templates.
+        super.trigger(game, controllerId, triggeringEvent);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
index e24fcd99a61..a760d680e32 100644
--- a/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
@@ -29,6 +29,6 @@ public final class EldraziScionToken extends TokenImpl {
 
     @Override
     public EldraziScionToken copy() {
-        return new EldraziScionToken(this); //To change body of generated methods, choose Tools | Templates.
+        return new EldraziScionToken(this);
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/EldraziSliverToken.java b/Mage/src/main/java/mage/game/permanent/token/EldraziSliverToken.java
index 85dd6a23b02..37d0021e0ad 100644
--- a/Mage/src/main/java/mage/game/permanent/token/EldraziSliverToken.java
+++ b/Mage/src/main/java/mage/game/permanent/token/EldraziSliverToken.java
@@ -27,6 +27,6 @@ public final class EldraziSliverToken extends TokenImpl {
 
     @Override
     public EldraziSliverToken copy() {
-        return new EldraziSliverToken(this); //To change body of generated methods, choose Tools | Templates.
+        return new EldraziSliverToken(this);
     }
 }
diff --git a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java
index bc8cf3feb5a..1893700232a 100644
--- a/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java
+++ b/Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java
@@ -27,6 +27,6 @@ public final class SoldierTokenWithHaste extends TokenImpl {
 
     @Override
     public SoldierTokenWithHaste copy() {
-        return new SoldierTokenWithHaste(this); //To change body of generated methods, choose Tools | Templates.
+        return new SoldierTokenWithHaste(this);
     }
 }
diff --git a/Mage/src/main/java/mage/game/stack/Spell.java b/Mage/src/main/java/mage/game/stack/Spell.java
index f45ff9af105..aa3e7502b54 100644
--- a/Mage/src/main/java/mage/game/stack/Spell.java
+++ b/Mage/src/main/java/mage/game/stack/Spell.java
@@ -1115,17 +1115,17 @@ public class Spell extends StackObjectImpl implements Card {
 
     @Override
     public List<UUID> getAttachments() {
-        throw new UnsupportedOperationException("Not supported."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported.");
     }
 
     @Override
     public boolean addAttachment(UUID permanentId, Ability source, Game game) {
-        throw new UnsupportedOperationException("Not supported."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported.");
     }
 
     @Override
     public boolean removeAttachment(UUID permanentId, Ability source, Game game) {
-        throw new UnsupportedOperationException("Not supported."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported.");
     }
 
     /**
diff --git a/Mage/src/main/java/mage/game/stack/StackAbility.java b/Mage/src/main/java/mage/game/stack/StackAbility.java
index 1f0dec6434a..8631b7a690d 100644
--- a/Mage/src/main/java/mage/game/stack/StackAbility.java
+++ b/Mage/src/main/java/mage/game/stack/StackAbility.java
@@ -521,12 +521,12 @@ public class StackAbility extends StackObjectImpl implements Ability {
 
     @Override
     public boolean activateAlternateOrAdditionalCosts(MageObject sourceObject, boolean noMana, Player controller, Game game) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
     public String getGameLogMessage(Game game) {
-        throw new UnsupportedOperationException("Not supported."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException("Not supported.");
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java
index 93dccfe7bd7..ffb62653343 100644
--- a/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java
+++ b/Mage/src/main/java/mage/target/common/TargetCreatureOrPlaneswalker.java
@@ -48,7 +48,7 @@ public class TargetCreatureOrPlaneswalker extends TargetPermanent {
                 return true;
             }
         }
-        return super.isLegal(source, game); //To change body of generated methods, choose Tools | Templates.
+        return super.isLegal(source, game);
     }
 
 }