diff --git a/res/cardsfolder/r/rackling.txt b/res/cardsfolder/r/rackling.txt
index 083deaf35e5..a059061ffa7 100644
--- a/res/cardsfolder/r/rackling.txt
+++ b/res/cardsfolder/r/rackling.txt
@@ -2,8 +2,8 @@ Name:Rackling
 ManaCost:4
 Types:Artifact Creature Construct
 PT:2/2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.YouDontCtrl | PresentZone$ Hand | PresentCompare$ LT3 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ X | References$ X
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Opponent | IsPresent$ Card.YouDontCtrl | PresentZone$ Hand | PresentCompare$ LT3 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:TriggeredPlayer$CardsInHand/NMinus.3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rackling.jpg
 Oracle:At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
\ No newline at end of file
diff --git a/res/cardsfolder/t/tithe.txt b/res/cardsfolder/t/tithe.txt
index 1074e097ee6..bc882254978 100644
--- a/res/cardsfolder/t/tithe.txt
+++ b/res/cardsfolder/t/tithe.txt
@@ -1,8 +1,11 @@
 Name:Tithe
 ManaCost:W
 Types:Instant
-A:SP$ ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 1 | Shuffle$ True | SpellDescription$ Search your library for a Plains card.
-A:SP$ ChangeZone | Cost$ W | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ 2 | Shuffle$ True | IsPresent$ Land.YouCtrl | PresentCompare$ LTX | References$ X | SpellDescription$ If you control fewer lands than an opponent, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
-SVar:X:Count$Valid Land.OppCtrl
+A:SP$ Pump | Cost$ W | ValidTgts$ Opponent | StackDescription$ None | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Plains | ChangeNum$ X | References$ X,Y,Z,MoreLand | Shuffle$ True
+SVar:X:Count$Compare MoreLand GE1.2.1
+SVar:Y:Count$Valid Land.YouCtrl
+SVar:Z:Count$Valid Land.TargetedPlayerCtrl
+SVar:MoreLand:SVar$Z/Minus.Y
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tithe.jpg
 Oracle:Search your library for a Plains card. If target opponent controls more lands than you, you may search your library for an additional Plains card. Reveal those cards and put them into your hand. Then shuffle your library.
\ No newline at end of file
diff --git a/res/cardsfolder/u/urborg_stalker.txt b/res/cardsfolder/u/urborg_stalker.txt
index f082ceff621..01e8de357a4 100644
--- a/res/cardsfolder/u/urborg_stalker.txt
+++ b/res/cardsfolder/u/urborg_stalker.txt
@@ -2,9 +2,7 @@ Name:Urborg Stalker
 ManaCost:3 B
 Types:Creature Horror
 PT:2/4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Permanent.nonBlack+nonLand+YouCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamageYou | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Permanent.nonBlack+nonLand+YouDontCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | Secondary$ True | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
-SVar:TrigDamageYou:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 1
-SVar:TrigDamageOpp:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | IsPresent$ Permanent.nonBlack+nonLand+ActivePlayerCtrl | PresentCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, CARDNAME deals 1 damage to that player.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urborg_stalker.jpg
 Oracle:At the beginning of each player's upkeep, if that player controls a nonblack, nonland permanent, Urborg Stalker deals 1 damage to that player.
\ No newline at end of file
diff --git a/res/cardsfolder/w/walking_archive.txt b/res/cardsfolder/w/walking_archive.txt
index bed032766ec..3ea556aef4c 100644
--- a/res/cardsfolder/w/walking_archive.txt
+++ b/res/cardsfolder/w/walking_archive.txt
@@ -4,11 +4,9 @@ Types:Artifact Creature Golem
 PT:1/1
 K:etbCounter:P1P1:1
 K:Defender
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigYouDraw | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigOppDraw | Secondary$ True | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's upkeep, that player draws a card for each +1/+1 counter on CARDNAME.
 A:AB$ PutCounter | Cost$ 2 W U | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:TrigYouDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ You | References$ X
-SVar:TrigOppDraw:AB$Draw | Cost$ 0 | NumCards$ X | Defined$ Opponent | References$ X
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ X | Defined$ TriggeredPlayer | References$ X
 SVar:X:Count$CardCounters.P1P1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/walking_archive.jpg
diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java
index 41228a6dd8b..b6ce32b4476 100644
--- a/src/main/java/forge/game/GameActionUtil.java
+++ b/src/main/java/forge/game/GameActionUtil.java
@@ -32,7 +32,6 @@ import forge.Card;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CardPredicates.Presets;
-import forge.CardUtil;
 import forge.Command;
 import forge.Constant;
 import forge.CounterType;
diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index 18b1ab0accb..5937bf80bda 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -19,9 +19,7 @@ import forge.Card;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.GameLogEntryType;
-import forge.Singletons;
 import forge.card.CardDb;
-import forge.card.CardEdition;
 import forge.card.trigger.Trigger;
 import forge.card.trigger.TriggerHandler;
 import forge.deck.CardPool;
diff --git a/src/main/java/forge/gui/match/controllers/CPicture.java b/src/main/java/forge/gui/match/controllers/CPicture.java
index 56fbbec7665..ff8ce1e0601 100644
--- a/src/main/java/forge/gui/match/controllers/CPicture.java
+++ b/src/main/java/forge/gui/match/controllers/CPicture.java
@@ -25,13 +25,11 @@ import forge.Card;
 import forge.CardCharacteristicName;
 import forge.Command;
 import forge.Singletons;
-import forge.card.CardEdition;
 import forge.gui.framework.ICDoc;
 import forge.gui.match.views.VPicture;
 import forge.gui.toolbox.special.CardZoomer;
 import forge.item.IPaperCard;
 import forge.item.InventoryItem;
-import forge.util.MyRandom;
 
 /**
  * Controls the card picture panel in the match UI.
diff --git a/src/main/java/forge/gui/match/nonsingleton/CCommand.java b/src/main/java/forge/gui/match/nonsingleton/CCommand.java
index adc5221c57d..e1522edd782 100644
--- a/src/main/java/forge/gui/match/nonsingleton/CCommand.java
+++ b/src/main/java/forge/gui/match/nonsingleton/CCommand.java
@@ -17,19 +17,9 @@
  */
 package forge.gui.match.nonsingleton;
 
-import java.awt.Event;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
-import java.awt.event.MouseMotionListener;
-import forge.Card;
 import forge.Command;
 import forge.game.player.Player;
-import forge.game.zone.ZoneType;
 import forge.gui.framework.ICDoc;
-import forge.gui.match.CMatchUI;
-import forge.gui.match.controllers.CMessage;
 /**
  * Controls Swing components of a player's command instance.
  */