diff --git a/src/main/java/forge/card/replacement/ReplacementHandler.java b/src/main/java/forge/card/replacement/ReplacementHandler.java
index 51ae439435c..3bbb7ac1d9a 100644
--- a/src/main/java/forge/card/replacement/ReplacementHandler.java
+++ b/src/main/java/forge/card/replacement/ReplacementHandler.java
@@ -31,8 +31,6 @@ import forge.card.ability.AbilityFactory;
 import forge.card.ability.AbilityUtils;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;
-import forge.game.ai.ComputerUtil;
-import forge.game.player.HumanPlay;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
diff --git a/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java b/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java
index 3e21b2c6eba..9aeea79ae4d 100644
--- a/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java
+++ b/src/main/java/forge/card/spellability/HumanPlaySpellAbility.java
@@ -23,7 +23,6 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.Iterables;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.ITargetable;
 import forge.card.CardType;
 import forge.card.ability.AbilityUtils;
diff --git a/src/main/java/forge/control/FControl.java b/src/main/java/forge/control/FControl.java
index 141b8ba6143..2fc78387194 100644
--- a/src/main/java/forge/control/FControl.java
+++ b/src/main/java/forge/control/FControl.java
@@ -414,7 +414,6 @@ public enum FControl {
         CDock.SINGLETON_INSTANCE.setModel(game, humanLobbyPlayer);
         CStack.SINGLETON_INSTANCE.setModel(game.getStack(), humanLobbyPlayer);
         CLog.SINGLETON_INSTANCE.setModel(game.getGameLog());
-        CMessage.SINGLETON_INSTANCE.setModel(game);
     
     
         Singletons.getModel().getPreferences().actuateMatchPreferences();
diff --git a/src/main/java/forge/control/FControlGameEventHandler.java b/src/main/java/forge/control/FControlGameEventHandler.java
index 68c17e2bcb9..c067434b3d7 100644
--- a/src/main/java/forge/control/FControlGameEventHandler.java
+++ b/src/main/java/forge/control/FControlGameEventHandler.java
@@ -8,6 +8,7 @@ import com.google.common.eventbus.Subscribe;
 
 import forge.Card;
 import forge.FThreads;
+import forge.game.Game;
 import forge.game.event.GameEvent;
 import forge.game.event.GameEventAnteCardsSelected;
 import forge.game.event.GameEventGameFinished;
@@ -85,11 +86,12 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
     public Void visit(GameEventTurnBegan event) {
         if ( turnUpdPlanned.getAndSet(true) ) return null;
 
+        final Game game = fc.getObservedGame(); // to make sure control gets a correct game instance
         FThreads.invokeInEdtNowOrLater(new Runnable() {
             @Override
             public void run() {
                 turnUpdPlanned.set(false);
-                CMessage.SINGLETON_INSTANCE.updateText();
+                CMessage.SINGLETON_INSTANCE.updateText(game);
             }
         });
         return null;
diff --git a/src/main/java/forge/gui/match/controllers/CMessage.java b/src/main/java/forge/gui/match/controllers/CMessage.java
index 05a543f947d..b88f51478f2 100644
--- a/src/main/java/forge/gui/match/controllers/CMessage.java
+++ b/src/main/java/forge/gui/match/controllers/CMessage.java
@@ -69,7 +69,6 @@ public enum CMessage implements ICDoc {
             }
         }
     };
-    private Game game;
 
     private void _initButton(JButton button, ActionListener onClick) {
         // remove to ensure listeners don't accumulate over many initializations
@@ -116,10 +115,10 @@ public enum CMessage implements ICDoc {
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
 
-    public void updateText() {
+    public void updateText(Game game) {
         FThreads.assertExecutedByEdt(true);
-        Match match = game.getMatch();
-        String text = String.format("%s: Game #%d of %d, turn %d", match.getGameType(), match.getPlayedGames().size() + 1, match.getGamesPerMatch(), game.getPhaseHandler().getTurn());
+        final Match match = game.getMatch();
+        final String text = String.format("%s: Game #%d of %d, turn %d", match.getGameType(), match.getPlayedGames().size() + 1, match.getGamesPerMatch(), game.getPhaseHandler().getTurn());
         view.getLblGames().setText(text);
     }
 
@@ -130,14 +129,4 @@ public enum CMessage implements ICDoc {
             lastFocusedButton.requestFocusInWindow();
         }
     }
-
-
-    /**
-     * TODO: Write javadoc for this method.
-     * @param match
-     */
-    public void setModel(Game game0) {
-        game = game0;
-        update();
-    }
 }