diff --git a/res/cardsfolder/a/ancient_amphitheater.txt b/res/cardsfolder/a/ancient_amphitheater.txt
index c979598b0a1..fd8ab32acbd 100644
--- a/res/cardsfolder/a/ancient_amphitheater.txt
+++ b/res/cardsfolder/a/ancient_amphitheater.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal a Giant card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Giant> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_amphitheater.jpg
 Oracle:As Ancient Amphitheater enters the battlefield, you may reveal a Giant card from your hand. If you don't, Ancient Amphitheater enters the battlefield tapped.\n{T}: Add {R} or {W} to your mana pool.
 SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/a/aunties_hovel.txt b/res/cardsfolder/a/aunties_hovel.txt
index 4ebfdd50e0a..d347e244955 100644
--- a/res/cardsfolder/a/aunties_hovel.txt
+++ b/res/cardsfolder/a/aunties_hovel.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal a Goblin card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Goblin> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aunties_hovel.jpg
 Oracle:As Auntie's Hovel enters the battlefield, you may reveal a Goblin card from your hand. If you don't, Auntie's Hovel enters the battlefield tapped.\n{T}: Add {B} or {R} to your mana pool.
 SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/g/gilt_leaf_palace.txt b/res/cardsfolder/g/gilt_leaf_palace.txt
index 48a67d634c2..1a2c005b5be 100644
--- a/res/cardsfolder/g/gilt_leaf_palace.txt
+++ b/res/cardsfolder/g/gilt_leaf_palace.txt
@@ -5,6 +5,8 @@ Text:As CARDNAME enters the battlefield, you may reveal an Elf card from your ha
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 SVar:RemRandomDeck:True
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Elf> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gilt_leaf_palace.jpg
 Oracle:As Gilt-Leaf Palace enters the battlefield, you may reveal an Elf card from your hand. If you don't, Gilt-Leaf Palace enters the battlefield tapped.\n{T}: Add {B} or {G} to your mana pool.
 SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/g/glint_hawk.txt b/res/cardsfolder/g/glint_hawk.txt
index 57220db9d4e..19df1dd026f 100644
--- a/res/cardsfolder/g/glint_hawk.txt
+++ b/res/cardsfolder/g/glint_hawk.txt
@@ -3,11 +3,8 @@ ManaCost:W
 Types:Creature Bird
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Artifact.YouCtrl | RememberChanged$ True | SubAbility$ DBSac
-SVar:DBSac:DB$ Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ LT1 | References$ X
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Remembered$Amount
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand.
+SVar:DBSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self | UnlessCost$ Return<1/Artifact> | UnlessPayer$ You 
 SVar:NeedsToPlay:Artifact.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glint_hawk.jpg
 Oracle:Flying\nWhen Glint Hawk enters the battlefield, sacrifice it unless you return an artifact you control to its owner's hand.
diff --git a/res/cardsfolder/m/murmuring_bosk.txt b/res/cardsfolder/m/murmuring_bosk.txt
index 0badf153494..bbf8528e75f 100644
--- a/res/cardsfolder/m/murmuring_bosk.txt
+++ b/res/cardsfolder/m/murmuring_bosk.txt
@@ -4,6 +4,8 @@ Types:Land Forest
 Text:As CARDNAME enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBPain | SpellDescription$ Add W to your mana pool. CARDNAME deals 1 damage to you.
 A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBPain | SpellDescription$ Add B to your mana pool. CARDNAME deals 1 damage to you.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Treefolk> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:DBPain:DB$DealDamage | NumDmg$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/murmuring_bosk.jpg
 Oracle:({T}: Add {G} to your mana pool.)\nAs Murmuring Bosk enters the battlefield, you may reveal a Treefolk card from your hand. If you don't, Murmuring Bosk enters the battlefield tapped.\n{T}: Add {W} or {B} to your mana pool. Murmuring Bosk deals 1 damage to you.
diff --git a/res/cardsfolder/p/primal_beyond.txt b/res/cardsfolder/p/primal_beyond.txt
index 9c2c6250400..227955b1d5b 100644
--- a/res/cardsfolder/p/primal_beyond.txt
+++ b/res/cardsfolder/p/primal_beyond.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal an Elemental card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Card.Elemental,Activated.Elemental | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Elemental> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_beyond.jpg
 Oracle:As Primal Beyond enters the battlefield, you may reveal an Elemental card from your hand. If you don't, Primal Beyond enters the battlefield tapped.\n{T}: Add {1} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast an Elemental spell or activate an ability of an Elemental.
diff --git a/res/cardsfolder/r/rustic_clachan.txt b/res/cardsfolder/r/rustic_clachan.txt
index 0f269f7c085..f8cee4bb0e2 100644
--- a/res/cardsfolder/r/rustic_clachan.txt
+++ b/res/cardsfolder/r/rustic_clachan.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal a Kithkin card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ PutCounter | Cost$ 1 W Discard<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | ActivationZone$ Hand | PrecostDesc$ Reinforce 1 - | SpellDescription$ Put a +1/+1 counter on target creature.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Kithkin> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rustic_clachan.jpg
 Oracle:As Rustic Clachan enters the battlefield, you may reveal a Kithkin card from your hand. If you don't, Rustic Clachan enters the battlefield tapped.\n{T}: Add {W} to your mana pool.\nReinforce 1-{1}{W} ({1}{W}, Discard this card: Put a +1/+1 counter on target creature.)
 SetInfo:MOR Rare
diff --git a/res/cardsfolder/s/secluded_glen.txt b/res/cardsfolder/s/secluded_glen.txt
index 9dab2152528..a5f5e799f4e 100644
--- a/res/cardsfolder/s/secluded_glen.txt
+++ b/res/cardsfolder/s/secluded_glen.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal a Faerie card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Faerie> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/secluded_glen.jpg
 Oracle:As Secluded Glen enters the battlefield, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters the battlefield tapped.\n{T}: Add {U} or {B} to your mana pool.
 SetInfo:LRW Rare
\ No newline at end of file
diff --git a/res/cardsfolder/w/wanderwine_hub.txt b/res/cardsfolder/w/wanderwine_hub.txt
index b07afd081aa..254613be477 100644
--- a/res/cardsfolder/w/wanderwine_hub.txt
+++ b/res/cardsfolder/w/wanderwine_hub.txt
@@ -4,6 +4,8 @@ Types:Land
 Text:As CARDNAME enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
+K:ETBReplacement:Other:DBTap
+SVar:DBTap:AB$ Tap | Cost$ 0 | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Merfolk> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wanderwine_hub.jpg
 Oracle:As Wanderwine Hub enters the battlefield, you may reveal a Merfolk card from your hand. If you don't, Wanderwine Hub enters the battlefield tapped.\n{T}: Add {W} or {U} to your mana pool.
 SetInfo:LRW Rare
\ No newline at end of file
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryLands.java b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
index 377e2a88492..30bed19d6d7 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryLands.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryLands.java
@@ -117,70 +117,6 @@ class CardFactoryLands {
                 }
             });
         } // *************** END ************ END **************************
-
-        // *************** START *********** START **************************
-        // Lorwyn Dual Lands, and a couple Morningtide...
-        else if (cardName.equals("Ancient Amphitheater") || cardName.equals("Auntie's Hovel")
-                || cardName.equals("Gilt-Leaf Palace") || cardName.equals("Secluded Glen")
-                || cardName.equals("Wanderwine Hub") || cardName.equals("Rustic Clachan")
-                || cardName.equals("Murmuring Bosk") || cardName.equals("Primal Beyond")) {
-
-            String shortTemp = "";
-            if (cardName.equals("Ancient Amphitheater")) {
-                shortTemp = "Giant";
-            }
-            else if (cardName.equals("Auntie's Hovel")) {
-                shortTemp = "Goblin";
-            }
-            else if (cardName.equals("Gilt-Leaf Palace")) {
-                shortTemp = "Elf";
-            }
-            else if (cardName.equals("Secluded Glen")) {
-                shortTemp = "Faerie";
-            }
-            else if (cardName.equals("Wanderwine Hub")) {
-                shortTemp = "Merfolk";
-            }
-            else if (cardName.equals("Rustic Clachan")) {
-                shortTemp = "Kithkin";
-            }
-            else if (cardName.equals("Murmuring Bosk")) {
-                shortTemp = "Treefolk";
-            }
-            else if (cardName.equals("Primal Beyond")) {
-                shortTemp = "Elemental";
-            }
-
-            final String type = shortTemp;
-
-            card.addComesIntoPlayCommand(new Command() {
-                private static final long serialVersionUID = -5646344170306812481L;
-
-                @Override
-                public void execute() {
-                    List<Card> hand = CardLists.getType(card.getController().getCardsIn(ZoneType.Hand), type);
-                    List<Card> toReveal = null;
-                    if (!hand.isEmpty()) {
-                        if (card.getController().isHuman()) {
-                                InputSelectCards inp = new InputSelectCardsFromList(1, 1, hand);
-                                inp.setCancelAllowed(true);
-                                inp.setMessage("Reveal a " + type + " card.");
-                                FThreads.setInputAndWait(inp);
-                                toReveal = inp.hasCancelled() ? null : inp.getSelected();
-                        } else {
-                            // Ai wants to reveal the first card out of a list
-                            toReveal = hand.subList(0, 0);
-                        }
-                    } else toReveal = null;
-                    
-                    if (toReveal != null && !toReveal.isEmpty()) {
-                        card.getController().getGame().getAction().reveal(toReveal, card.getController());
-                    } else {
-                        card.setTapped(true);
-                    }
-                }
-            });
-        } // *************** END ************ END **************************
     }
 
 } // end class CardFactoryLands