diff --git a/src/main/java/forge/GameLogFormatter.java b/src/main/java/forge/GameLogFormatter.java
index 5c7fa33eba2..40851a196d0 100644
--- a/src/main/java/forge/GameLogFormatter.java
+++ b/src/main/java/forge/GameLogFormatter.java
@@ -6,7 +6,6 @@ import java.util.Map.Entry;
 
 import com.google.common.eventbus.Subscribe;
 
-import forge.card.spellability.SpellAbility;
 import forge.card.spellability.TargetChoices;
 import forge.game.GameOutcome;
 import forge.game.event.GameEventCardDamaged;
@@ -65,28 +64,16 @@ public class GameLogFormatter extends IGameEventVisitor.Base<GameLogEntry> {
 
     @Override
     public GameLogEntry visit(GameEventSpellAbilityCast event) {
-        SpellAbility sp = event.sa;
-        final List<TargetChoices> chosenTargets = sp.getAllTargetChoices();
-
+        String who = event.sa.getActivatingPlayer().getName();
+        String action = event.sa.isSpell() ? " cast " : " activated ";
+        String what = event.sa.getStackDescription().startsWith("Morph ") ? "Morph" : event.sa.getSourceCard().toString();
 
         StringBuilder sb = new StringBuilder();
-        sb.append(sp.getActivatingPlayer());
-        if (sp.isSpell()) {
-            sb.append(" cast ");
-        }
-        else if (sp.isAbility()) {
-            sb.append(" activated ");
-        }
+        sb.append(who).append(action).append(what);
 
-        if (sp.getStackDescription().startsWith("Morph ")) {
-            sb.append("Morph");
-        } else {
-            sb.append(sp.getSourceCard());
-        }
-
-        if (sp.getTarget() != null) {
+        if (event.sa.getTarget() != null) {
             sb.append(" targeting ");
-            for (TargetChoices ch : chosenTargets) {
+            for (TargetChoices ch : event.sa.getAllTargetChoices()) {
                 if (null != ch) {
                     sb.append(ch.getTargetedString());
                 }
diff --git a/src/main/java/forge/card/ability/effects/ControlGainEffect.java b/src/main/java/forge/card/ability/effects/ControlGainEffect.java
index a8e3642c52c..81582e4a498 100644
--- a/src/main/java/forge/card/ability/effects/ControlGainEffect.java
+++ b/src/main/java/forge/card/ability/effects/ControlGainEffect.java
@@ -13,7 +13,6 @@ import forge.card.spellability.Ability;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.Target;
 import forge.game.Game;
-import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 
diff --git a/src/main/java/forge/game/limited/DraftRankCache.java b/src/main/java/forge/game/limited/DraftRankCache.java
index 1f60c541d83..2457fe3c98b 100644
--- a/src/main/java/forge/game/limited/DraftRankCache.java
+++ b/src/main/java/forge/game/limited/DraftRankCache.java
@@ -6,26 +6,12 @@ package forge.game.limited;
  * @author arman.sepetci
  */
 public class DraftRankCache {
-    
-    private static DraftRankCache instance = null;
     private static ReadDraftRankings rankings = null;
     
     private DraftRankCache(){
         
     }
-    
-    public static DraftRankCache getInstance(){
-        if (instance == null) {
-            instance = new DraftRankCache();
-        }
-        return instance;
-    }
-    
-    @Override
-    public DraftRankCache clone(){
-        return null;
-    }
-    
+
     public static Double getRanking(String name, String edition){
         if (rankings == null){
             rankings = new ReadDraftRankings();