diff --git a/res/cardsfolder/glimmervoid.txt b/res/cardsfolder/glimmervoid.txt
index 91718ee36ca..a20e557d65d 100644
--- a/res/cardsfolder/glimmervoid.txt
+++ b/res/cardsfolder/glimmervoid.txt
@@ -1,12 +1,14 @@
 Name:Glimmervoid
 ManaCost:no cost
 Types:Land
-Text:At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME.
+Text:no text
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add B to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add U to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add R to your mana pool.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimmervoid.jpg
diff --git a/res/cardsfolder/thran_quarry.txt b/res/cardsfolder/thran_quarry.txt
index 970b3a1d0a5..d6cdf4888d8 100644
--- a/res/cardsfolder/thran_quarry.txt
+++ b/res/cardsfolder/thran_quarry.txt
@@ -1,12 +1,14 @@
 Name:Thran Quarry
 ManaCost:no cost
 Types:Land
-Text:At the beginning of the end step, if you control no creatures, sacrifice CARDNAME.
+Text:no text
 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.
 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.
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add G to your mana pool.
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if you control no artifacts, sacrifice CARDNAME.
+SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_quarry.jpg
diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java
index c7c401b53e6..aca00b8ae7a 100644
--- a/src/forge/EndOfTurn.java
+++ b/src/forge/EndOfTurn.java
@@ -33,11 +33,8 @@ public class EndOfTurn implements java.io.Serializable
     GameActionUtil.endOfTurn_Predatory_Advantage();
     GameActionUtil.endOfTurn_Wall_Of_Reverence();
     GameActionUtil.endOfTurn_Lighthouse_Chronologist();
-    GameActionUtil.endOfTurn_Thran_Quarry();
-    GameActionUtil.endOfTurn_Glimmervoid();
     GameActionUtil.endOfTurn_Krovikan_Horror();
     
-    //GameActionUtil.removeExaltedEffects();
     GameActionUtil.removeAttackedBlockedThisTurn();
     AllZone.GameInfo.setPreventCombatDamageThisTurn(false);
     
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 98d51a897aa..0a5bfeea196 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -3258,40 +3258,6 @@ public class GameActionUtil {
 			AllZone.Stack.add(ability);
 		}
 	}
-	
-	public static void endOfTurn_Thran_Quarry() 
-	{
-		final Player player = AllZone.Phase.getPlayerTurn();
-		final Player opponent = player.getOpponent();
-		controlNoTypeSacrifice("Thran Quarry", "Creature", player);
-		controlNoTypeSacrifice("Thran Quarry", "Creature", opponent);
-	}
-	
-	public static void endOfTurn_Glimmervoid() 
-	{ 		
-		final Player player = AllZone.Phase.getPlayerTurn();
-		final Player opponent = player.getOpponent();
-		controlNoTypeSacrifice("Glimmervoid", "Artifact", player);
-		controlNoTypeSacrifice("Glimmervoid", "Artifact", opponent);
-	}
-	
-	public static void controlNoTypeSacrifice(String name, String type, Player player)
-	{
-		final PlayerZone playZone = AllZone.getZone(Constant.Zone.Battlefield, player);
-		CardList list = new CardList(playZone.getCards());
-
-		CardList nameList = list.getName(name);
-		
-		if (nameList.size() == 0) return;
-		
-		CardList typeList = list.getType(type);
-		
-		if (typeList.size() == 0){
-			for(Card c : nameList){
-				AllZone.GameAction.sacrifice(c);
-			}
-		}
-	}
 
 	public static void endOfTurn_Krovikan_Horror()
 	{