diff --git a/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java b/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java
index c654b4f86d6..fdb113ae43c 100644
--- a/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java
+++ b/src/main/java/forge/card/trigger/TriggerPlaneswalkedFrom.java
@@ -1,6 +1,5 @@
 package forge.card.trigger;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import forge.Card;
@@ -31,10 +30,11 @@ public class TriggerPlaneswalkedFrom extends Trigger {
     /* (non-Javadoc)
      * @see forge.card.trigger.Trigger#performTest(java.util.Map)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public boolean performTest(Map<String, Object> runParams2) {
         if (this.mapParams.containsKey("ValidCard")) {
-            for(Card moved : (ArrayList<Card>)runParams2.get("Card"))
+            for(Card moved : (Iterable<Card>)runParams2.get("Card"))
             {
                 if (moved.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(),
                         this.getHostCard())) {
diff --git a/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java b/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java
index 83cd56ab5d6..bfcea8fbddc 100644
--- a/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java
+++ b/src/main/java/forge/card/trigger/TriggerPlaneswalkedTo.java
@@ -1,6 +1,5 @@
 package forge.card.trigger;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import forge.Card;
@@ -31,10 +30,11 @@ public class TriggerPlaneswalkedTo extends Trigger {
     /* (non-Javadoc)
      * @see forge.card.trigger.Trigger#performTest(java.util.Map)
      */
+    @SuppressWarnings("unchecked")
     @Override
     public boolean performTest(Map<String, Object> runParams2) {
         if (this.mapParams.containsKey("ValidCard")) {
-            for(Card moved : (ArrayList<Card>)runParams2.get("Card"))
+            for(Card moved : (Iterable<Card>)runParams2.get("Card"))
             {
                 if (moved.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(),
                         this.getHostCard())) {
diff --git a/src/main/java/forge/game/ai/ComputerUtilCard.java b/src/main/java/forge/game/ai/ComputerUtilCard.java
index ebdd1b3fd0e..b232b9502aa 100644
--- a/src/main/java/forge/game/ai/ComputerUtilCard.java
+++ b/src/main/java/forge/game/ai/ComputerUtilCard.java
@@ -1,15 +1,12 @@
 package forge.game.ai;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Random;
-
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -35,7 +32,6 @@ import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.item.CardPrinted;
 import forge.util.Aggregates;
-import forge.util.MyRandom;
 
 /** 
  * TODO: Write javadoc for this type.
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index f59f81befd2..f3645808e37 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -68,7 +68,6 @@ import forge.game.phase.PhaseHandler;
 import forge.game.phase.PhaseType;
 import forge.game.zone.PlayerZone;
 import forge.game.zone.PlayerZoneBattlefield;
-import forge.game.zone.Zone;
 import forge.game.zone.ZoneType;
 import forge.gui.GuiChoose;
 import forge.gui.GuiDialog;