diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsDrawnThisTurnDynamicValue.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsDrawnThisTurnDynamicValue.java
index a698b507011..5a28840e1cb 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsDrawnThisTurnDynamicValue.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/CardsDrawnThisTurnDynamicValue.java
@@ -8,8 +8,6 @@ import mage.game.Game;
 import mage.watchers.common.CardsDrawnThisTurnWatcher;
 
 /**
- * Don't forget to add CardsDrawnThisTurnWatcher in card's definition
- *
  * @author TheElk801
  */
 public enum CardsDrawnThisTurnDynamicValue implements DynamicValue {
@@ -45,4 +43,3 @@ public enum CardsDrawnThisTurnDynamicValue implements DynamicValue {
         return hint;
     }
 }
-
diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java
index fe5515d0cd9..83683486830 100644
--- a/Mage/src/main/java/mage/game/GameImpl.java
+++ b/Mage/src/main/java/mage/game/GameImpl.java
@@ -1340,10 +1340,10 @@ public abstract class GameImpl implements Game {
         newWatchers.add(new CastSpellLastTurnWatcher());
         newWatchers.add(new PlayerLostLifeWatcher());
         newWatchers.add(new BlockedAttackerWatcher());
-        newWatchers.add(new DamageDoneWatcher());
-        newWatchers.add(new PlanarRollWatcher());
+        newWatchers.add(new DamageDoneWatcher()); // TODO: no need to be default watcher
+        newWatchers.add(new PlanarRollWatcher()); // TODO: no need to be default watcher
         newWatchers.add(new AttackedThisTurnWatcher());
-        newWatchers.add(new PlayersAttackedThisTurnWatcher());
+        newWatchers.add(new PlayersAttackedThisTurnWatcher()); // TODO: no need to be default watcher
         newWatchers.add(new CardsDrawnThisTurnWatcher());
         newWatchers.add(new ManaSpentToCastWatcher());
         newWatchers.add(new ManaPaidSourceWatcher());
diff --git a/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java
index b199c5b431a..59ce6c2f55b 100644
--- a/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java
@@ -23,6 +23,9 @@ public class AttackedThisTurnWatcher extends Watcher {
     // issue with Robber of the Rich.  it needs to check the subtype of the LKI of the permanent on the battlefield and this fails with MageObjectReference
     private final Set<Permanent> attackedThisTurnCreaturesPermanentLKI = new HashSet<>();
 
+    /**
+     * Game default watcher
+     */
     public AttackedThisTurnWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
index 0e8b886c0a2..da89eacc3fd 100644
--- a/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
@@ -16,6 +16,9 @@ public class BlockingOrBlockedWatcher extends Watcher {
 
     private final Map<MageObjectReference, Set<MageObjectReference>> blockerMap = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public BlockingOrBlockedWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java
index 56a67a53b81..0f87de7885c 100644
--- a/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/CommanderPlaysCountWatcher.java
@@ -24,6 +24,9 @@ public class CommanderPlaysCountWatcher extends Watcher {
     private final Map<UUID, Integer> playsCount = new HashMap<>();
     private final Map<UUID, Integer> playerCount = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public CommanderPlaysCountWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/EndStepCountWatcher.java b/Mage/src/main/java/mage/watchers/common/EndStepCountWatcher.java
index 2527cc48bfd..1dea7622d4e 100644
--- a/Mage/src/main/java/mage/watchers/common/EndStepCountWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/EndStepCountWatcher.java
@@ -17,6 +17,9 @@ public class EndStepCountWatcher extends Watcher {
 
     private final Map<UUID, Integer> playerMap = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public EndStepCountWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java b/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java
index 56320462c0b..c3921737ceb 100644
--- a/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/ManaPaidSourceWatcher.java
@@ -110,6 +110,9 @@ public class ManaPaidSourceWatcher extends Watcher {
     private static final ManaPaidTracker emptyTracker = new ManaPaidTracker();
     private final Map<UUID, ManaPaidTracker> manaMap = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public ManaPaidSourceWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java b/Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java
index 28fc4350146..a7c6b55c755 100644
--- a/Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/ManaSpentToCastWatcher.java
@@ -24,6 +24,9 @@ public class ManaSpentToCastWatcher extends Watcher {
 
     private final Map<MageObjectReference, Mana> manaMap = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public ManaSpentToCastWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java b/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java
index e3713c14c33..217122b40bd 100644
--- a/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/MorbidWatcher.java
@@ -15,6 +15,7 @@ public class MorbidWatcher extends Watcher {
 
     /**
      * Game default watcher
+     * TODO: Merge with CreaturesDiedWatcher
      */
     public MorbidWatcher() {
         super(WatcherScope.GAME);
diff --git a/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java b/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java
index 21474f1ba8e..fd07dc2b62d 100644
--- a/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/SpellsCastWatcher.java
@@ -24,6 +24,9 @@ public class SpellsCastWatcher extends Watcher {
     private final Map<UUID, List<Spell>> spellsCastFromGraveyard = new HashMap<>();
     private int nonCreatureSpells;
 
+    /**
+     * Game default watcher
+     */
     public SpellsCastWatcher() {
         super(WatcherScope.GAME);
     }
diff --git a/Mage/src/main/java/mage/watchers/common/TemptedByTheRingWatcher.java b/Mage/src/main/java/mage/watchers/common/TemptedByTheRingWatcher.java
index f8864fd47df..0513207ac4d 100644
--- a/Mage/src/main/java/mage/watchers/common/TemptedByTheRingWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/TemptedByTheRingWatcher.java
@@ -17,6 +17,9 @@ public class TemptedByTheRingWatcher extends Watcher {
 
     private final Map<UUID, Integer> map = new HashMap<>();
 
+    /**
+     * Game default watcher
+     */
     public TemptedByTheRingWatcher() {
         super(WatcherScope.GAME);
     }