diff --git a/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolDrake.java b/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolDrake.java
index 6db147ec7f0..f43be167644 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolDrake.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/WhirlpoolDrake.java
@@ -100,9 +100,7 @@ class WhirlpoolSDrakeTriggeredEffect extends OneShotEffect {
         if (controller != null) {
             int cardsHand = controller.getHand().size();
             if (cardsHand > 0){
-                Cards cards = controller.getHand();
-                for (UUID cardId: cards) {
-                    Card card = game.getCard(cardId);
+                for (Card card: controller.getHand().getCards(game)) {
                     if (card != null) {
                         controller.removeFromHand(card, game);
                         card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
diff --git a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java
index 47a87b76bd2..3d9fc4a1496 100644
--- a/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java
+++ b/Mage.Sets/src/mage/sets/planechase2012/WhirlpoolWarrior.java
@@ -102,9 +102,7 @@ class WhirlpoolWarriorTriggeredEffect extends OneShotEffect {
         if (controller != null) {
             int cardsHand = controller.getHand().size();
             if (cardsHand > 0){
-                Cards cards = controller.getHand();
-                for (UUID cardId: cards) {
-                    Card card = game.getCard(cardId);
+                for (Card card: controller.getHand().getCards(game)) {
                     if (card != null) {
                         controller.removeFromHand(card, game);
                         card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
@@ -145,10 +143,9 @@ class WhirlpoolWarriorActivatedEffect extends OneShotEffect {
                 if (player != null) {
                     int cardsHand = player.getHand().size();
                     if (cardsHand > 0){
-                        for (UUID cardId: player.getHand()) {
-                            Card card = game.getCard(cardId);
+                        for (Card card: player.getHand().getCards(game)) {
                             if (card != null) {
-                                player.removeFromHand(card, game);                                
+                                player.removeFromHand(card, game);
                                 card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
                             }
                         }
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
index da2650cbb72..0deef747a80 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/MoltenPsyche.java
@@ -90,10 +90,9 @@ class MoltenPsycheEffect extends OneShotEffect {
             Player player = game.getPlayer(playerId);
             if (player != null) {
                 int count = player.getHand().size();
-                for (UUID cardId: player.getHand()) {
-                    Card card = game.getCard(cardId);
+                for (Card card: player.getHand().getCards(game)) {
                     if (card != null) {
-                        player.removeFromHand(card, game);                                
+                        player.removeFromHand(card, game);
                         card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
                     }
                 }