diff --git a/res/cardsfolder/high_tide.txt b/res/cardsfolder/high_tide.txt
index a52db13afc1..95c6b9feadf 100644
--- a/res/cardsfolder/high_tide.txt
+++ b/res/cardsfolder/high_tide.txt
@@ -1,7 +1,10 @@
 Name:High Tide
 ManaCost:U
 Types:Instant
-Text:Until end of turn, whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
+Text:no text
+A:SP$ Effect | Cost$ U | Name$ High Tide Effect | Triggers$ IslandTrigger | SVars$ TrigMana | SpellDescription$ Until end of turn, whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
+SVar:IslandTrigger:Mode$ TapsForMana | ValidCard$ Island | Execute$ TrigMana | TriggerDescription$ Whenever a player taps an Island for mana, that player adds U to his or her mana pool (in addition to the mana the land produces).
+SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ U | Amount$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/high_tide.jpg
diff --git a/res/cardsfolder/nirkana_revenant.txt b/res/cardsfolder/nirkana_revenant.txt
index 85c1e4eb2fa..2a5e206fee9 100644
--- a/res/cardsfolder/nirkana_revenant.txt
+++ b/res/cardsfolder/nirkana_revenant.txt
@@ -1,9 +1,11 @@
 Name:Nirkana Revenant
 ManaCost:4 B B
 Types:Creature Vampire Shade
-Text:Whenever you tap a Swamp for mana, add 1 black mana to your mana pool (in addition to the mana the land produces).
+Text:no text
 PT:4/4
-A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Nirkana Revenant gets +1/+1 until end of turn.
+A:AB$ Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+T:Mode$ TapsForMana | ValidCard$ Swamp.YouCtrl | Execute$ TrigMana | TriggerDescription$ Whenever you tap a Swamp for mana, add B to your mana pool (in addition to the mana the land produces).
+SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ B | Amount$ 1
 SVar:RemAIDeck:True
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nirkana_revenant.jpg
diff --git a/src/forge/Phase.java b/src/forge/Phase.java
index 787f5f79427..f15897e89ec 100644
--- a/src/forge/Phase.java
+++ b/src/forge/Phase.java
@@ -14,7 +14,6 @@ public class Phase extends MyObservable
 
 	private static int	 	GameBegins = 0;
     private static int	   StormCount;
-    private static CardList		HighTides = new CardList();
     static int	   PlayerSpellCount;
     static int	   PlayerCreatureSpellCount;   
     static int	   ComputerSpellCount;
@@ -151,7 +150,6 @@ public class Phase extends MyObservable
     
     public void turnReset(){
     	setStormCount(0);
-    	getHighTides().clear();
         PlayerSpellCount = 0;
         PlayerCreatureSpellCount = 0;   
         ComputerSpellCount = 0;
@@ -636,14 +634,6 @@ public class Phase extends MyObservable
 		return StormCount;
 	}
 
-	public static void setHighTides(CardList highTides) {
-		HighTides = highTides;
-	}
-
-	public static CardList getHighTides() {
-		return HighTides;
-	}
-
 	public static void setManaDrain_BonusMana_Human(
 			ArrayList<Integer> manaDrain_BonusMana_Human) {
 		ManaDrain_BonusMana_Human = manaDrain_BonusMana_Human;
diff --git a/src/forge/card/cardFactory/CardFactory_Instants.java b/src/forge/card/cardFactory/CardFactory_Instants.java
index a5bd0f5e03d..30148b9ea79 100644
--- a/src/forge/card/cardFactory/CardFactory_Instants.java
+++ b/src/forge/card/cardFactory/CardFactory_Instants.java
@@ -1111,28 +1111,6 @@ public class CardFactory_Instants {
         }//*************** END ************ END **************************
         
 
-        //*************** START *********** START **************************
-        else if(cardName.equals("High Tide")) {
-            SpellAbility spell = new Spell(card) {
-                private static final long serialVersionUID = -4997834721261916L;
-                
-                @Override
-                public boolean canPlayAI() {                   
-                    return false;
-                }//canPlay()
-                
-                @Override
-                public void resolve() {
-                	Phase.getHighTides().add(this.getSourceCard());
-                }//resolve()
-            };//SpellAbility
-            
-            // Do not remove SpellAbilities created by AbilityFactory or Keywords.
-            card.clearFirstSpellAbility();
-            card.addSpellAbility(spell);
-        }//*************** END ************ END **************************
-        
-
         //*************** START *********** START **************************
         else if(cardName.equals("Tithe")) {
             SpellAbility spell = new Spell(card) {
diff --git a/src/forge/card/spellability/Ability_Mana.java b/src/forge/card/spellability/Ability_Mana.java
index b5679d34422..f5e6a6ffe23 100644
--- a/src/forge/card/spellability/Ability_Mana.java
+++ b/src/forge/card/spellability/Ability_Mana.java
@@ -76,28 +76,7 @@ abstract public class Ability_Mana extends Ability_Activated implements java.io.
 		// this.getActivatingPlayer().ManaPool.addManaToFloating(origProduced, getSourceCard());
 		AllZone.ManaPool.addManaToFloating(produced, source);
 
-		// TODO: all of the following would be better as trigger events "tapped for mana"
-		
-		if (source.getType().contains("Swamp")){
-			// If Nirkana Revenant triggers, make mana undoable
-
-			CardList nirkanas = AllZoneUtil.getPlayerCardsInPlay(getActivatingPlayer(), "Nirkana Revenant");
-			int size = nirkanas.size();
-			for(int i = 0; i < size; i++){
-				this.undoable = false;
-				AllZone.ManaPool.addManaToFloating("B", nirkanas.get(i));
-			}
-		}
-		if (source.getType().contains("Island")){
-			// If High Tide triggers, make mana undoable
-			
-			int size = Phase.getHighTides().size();
-			for(int i = 0; i < size; i++){
-				this.undoable = false;
-				AllZone.ManaPool.addManaToFloating("U", Phase.getHighTides().get(i));
-			}
-		}
-		
+		// TODO: all of the following would be better as trigger events "tapped for mana"		
         if(source.getName().equals("Rainbow Vale")) {
         	this.undoable = false;
         	source.addExtrinsicKeyword("An opponent gains control of CARDNAME at the beginning of the next end step.");