diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 4a40fbd06ae..41acece7191 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -2751,8 +2751,8 @@ public class CardFactoryUtil {
             sb.append(", then put the rest on the bottom of your library.");
             final Trigger hideawayTrigger = TriggerHandler.parseTrigger(sb.toString(), card, intrinsic);
 
-            String hideawayDig = "DB$ Dig | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | RememberChanged$ True";
-            String hideawayEffect = "DB$ Effect | StaticAbilities$ STHideawayEffectLookAtCard | ForgetOnMoved$ Exile | RememberObjects$ Remembered | Duration$ Permanent";
+            String hideawayDig = "DB$ Dig | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True";
+            String hideawayEffect = "DB$ Effect | StaticAbilities$ STHideawayEffectLookAtCard | ForgetOnMoved$ Exile | RememberObjects$ ExiledWith | Duration$ Permanent";
 
             String lookAtCard = "Mode$ Continuous | Affected$ Card.IsRemembered | MayLookAt$ True | EffectZone$ Command | AffectedZone$ Exile | Description$ You may look at the exiled card.";
 
@@ -2771,12 +2771,6 @@ public class CardFactoryUtil {
             gainControlTrigger.setOverridingAbility((AbilitySub)effectSA.copy());
             triggers.add(gainControlTrigger);
 
-            // when the card with hideaway leaves the battlefield, forget all exiled cards
-            final Trigger changeZoneTrigger = TriggerHandler.parseTrigger("Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | TriggerZone$ Battlefield | Static$ True", card, intrinsic);
-            String cleanupStr = "DB$ Cleanup | ClearRemembered$ True";
-            changeZoneTrigger.setOverridingAbility(AbilityFactory.getAbility(cleanupStr, card));
-            triggers.add(changeZoneTrigger);
-
             for (final Trigger trigger : triggers) {
                 inst.addTrigger(trigger);
             }
diff --git a/forge-gui/res/cardsfolder/h/howltooth_hollow.txt b/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
index 4a648190bed..68b29f0fc3c 100644
--- a/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
+++ b/forge-gui/res/cardsfolder/h/howltooth_hollow.txt
@@ -3,8 +3,7 @@ ManaCost:no cost
 Types:Land
 K:Hideaway
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
-A:AB$ Play | Cost$ B T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ Hands | ConditionSVarCompare$ EQ0 | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if each player has no cards in hand.
+A:AB$ Play | Cost$ B T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ Hands | ConditionSVarCompare$ EQ0 | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if each player has no cards in hand.
 SVar:Hands:Count$NumInAllHands
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/howltooth_hollow.jpg
 Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {B}.\n{B}, {T}: You may play the exiled card without paying its mana cost if each player has no cards in hand.
diff --git a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
index ac684f274ae..d575a8d33d3 100644
--- a/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
+++ b/forge-gui/res/cardsfolder/m/mosswort_bridge.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land
 K:Hideaway
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Play | Cost$ G T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
+A:AB$ Play | Cost$ G T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE10 | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
 SVar:X:Count$SumPower_Creature.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mosswort_bridge.jpg
 Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {G}.\n{G}, {T}: You may play the exiled card without paying its mana cost if creatures you control have total power 10 or greater.
diff --git a/forge-gui/res/cardsfolder/s/shelldock_isle.txt b/forge-gui/res/cardsfolder/s/shelldock_isle.txt
index e8f2f1a6823..90e16971be2 100644
--- a/forge-gui/res/cardsfolder/s/shelldock_isle.txt
+++ b/forge-gui/res/cardsfolder/s/shelldock_isle.txt
@@ -3,8 +3,7 @@ ManaCost:no cost
 Types:Land
 K:Hideaway
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-A:AB$ Play | Cost$ U T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LE20 | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
+A:AB$ Play | Cost$ U T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LE20 |  AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
 SVar:X:PlayerCountPlayers$LowestValidLibrary Card.YouOwn
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shelldock_isle.jpg
 Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {U}.\n{U}, {T}: You may play the exiled card without paying its mana cost if a library has twenty or fewer cards in it.
diff --git a/forge-gui/res/cardsfolder/s/spinerock_knoll.txt b/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
index b260a8d2632..78f03d9b564 100644
--- a/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
+++ b/forge-gui/res/cardsfolder/s/spinerock_knoll.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land
 K:Hideaway
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
-A:AB$ Play | Cost$ R T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | ForgetRemembered$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
+A:AB$ Play | Cost$ R T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
 SVar:X:Count$MaxOppDamageThisTurn
-SVar:Picture:http://www.wizards.com/global/images/magic/general/spinerock_knoll.jpg
 Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {R}.\n{R}, {T}: You may play the exiled card without paying its mana cost if an opponent was dealt 7 or more damage this turn.
diff --git a/forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt b/forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt
index 5c1dc7fadc0..5f79769512c 100644
--- a/forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt
+++ b/forge-gui/res/cardsfolder/w/watcher_for_tomorrow.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Human Wizard
 PT:2/1
 K:Hideaway
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | Execute$ DBReturn | TriggerDescription$ When Watcher for Tomorrow leaves the battlefield, put the exiled card into its owner's hand.
-SVar:DBReturn:DB$ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Hand
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBReturn | TriggerDescription$ When CARDNAME leaves the battlefield, put the exiled card into its owner's hand.
+SVar:DBReturn:DB$ ChangeZone | Defined$ ExiledWith | Origin$ Exile | Destination$ Hand
 Oracle:Hideaway (This creature enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\nWhen Watcher for Tomorrow leaves the battlefield, put the exiled card into its owner's hand.
diff --git a/forge-gui/res/cardsfolder/w/windbrisk_heights.txt b/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
index 26f062e1f3c..a91ac2c486b 100644
--- a/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
+++ b/forge-gui/res/cardsfolder/w/windbrisk_heights.txt
@@ -3,7 +3,6 @@ ManaCost:no cost
 Types:Land
 K:Hideaway
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-A:AB$ Play | Cost$ W T | Defined$ Remembered | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | ForgetRemembered$ True | PlayerTurn$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
+A:AB$ Play | Cost$ W T | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | PlayerTurn$ True | AILogic$ CheckCondition | SpellDescription$ You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.
 SVar:X:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/windbrisk_heights.jpg
 Oracle:Hideaway (This land enters the battlefield tapped. When it does, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library.)\n{T}: Add {W}.\n{W}, {T}: You may play the exiled card without paying its mana cost if you attacked with three or more creatures this turn.