diff --git a/Mage.Sets/src/mage/cards/d/DreadRider.java b/Mage.Sets/src/mage/cards/d/DreadRider.java
index 47d97a316f7..8e5338aa92a 100644
--- a/Mage.Sets/src/mage/cards/d/DreadRider.java
+++ b/Mage.Sets/src/mage/cards/d/DreadRider.java
@@ -33,7 +33,7 @@ public final class DreadRider extends CardImpl {
         // {1}{B}, {T}, Exile a creature card from your graveyard: Target opponent loses 3 life.
         Ability ability = new SimpleActivatedAbility(new LoseLifeTargetEffect(3), new ManaCostsImpl("{1}{B}"));
         ability.addCost(new TapSourceCost());
-        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
+        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A)));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java
index 28fc1de53f3..b6a69302b74 100644
--- a/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java
+++ b/Mage.Sets/src/mage/cards/e/EgonGodOfDeath.java
@@ -1,6 +1,5 @@
 package mage.cards.e;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@@ -12,21 +11,20 @@ import mage.abilities.effects.common.DoIfCostPaid;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.MillCardsControllerEffect;
 import mage.abilities.effects.common.SacrificeSourceEffect;
-import mage.cards.ModalDoubleFacesCard;
-import mage.constants.*;
 import mage.abilities.keyword.DeathtouchAbility;
 import mage.cards.CardSetInfo;
-import mage.filter.common.FilterCreatureCard;
+import mage.cards.ModalDoubleFacesCard;
+import mage.constants.*;
+import mage.filter.StaticFilters;
 import mage.target.common.TargetCardInYourGraveyard;
 
+import java.util.UUID;
+
 /**
- *
  * @author weirddan455
  */
 public final class EgonGodOfDeath extends ModalDoubleFacesCard {
 
-    private static final FilterCreatureCard filter = new FilterCreatureCard("a creature card from your graveyard");
-
     public EgonGodOfDeath(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo,
                 new CardType[]{CardType.CREATURE}, new SubType[]{SubType.GOD}, "{2}{B}",
@@ -65,7 +63,7 @@ public final class EgonGodOfDeath extends ModalDoubleFacesCard {
         // {2}{B}, {T}, Exile a creature card from your graveyard: Draw a card
         Ability ability = new SimpleActivatedAbility(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{B}"));
         ability.addCost(new TapSourceCost());
-        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(filter)));
+        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A)));
         this.getRightHalfCard().addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/l/LittjaraGladeWarden.java b/Mage.Sets/src/mage/cards/l/LittjaraGladeWarden.java
index 30698d54e72..ca9f39370a7 100644
--- a/Mage.Sets/src/mage/cards/l/LittjaraGladeWarden.java
+++ b/Mage.Sets/src/mage/cards/l/LittjaraGladeWarden.java
@@ -43,7 +43,7 @@ public final class LittjaraGladeWarden extends CardImpl {
         );
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(
-                StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD
+                StaticFilters.FILTER_CARD_CREATURE_A
         )));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/MasterSkald.java b/Mage.Sets/src/mage/cards/m/MasterSkald.java
index 6719168212d..88e85fbd6a6 100644
--- a/Mage.Sets/src/mage/cards/m/MasterSkald.java
+++ b/Mage.Sets/src/mage/cards/m/MasterSkald.java
@@ -37,7 +37,7 @@ public final class MasterSkald extends CardImpl {
         Ability ability = new EntersBattlefieldTriggeredAbility(new DoIfCostPaid(
                 new ReturnFromGraveyardToHandTargetEffect(),
                 new ExileFromGraveCost(new TargetCardInYourGraveyard(
-                        StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD
+                        StaticFilters.FILTER_CARD_CREATURE_A
                 ))
         ));
         ability.addTarget(new TargetCardInYourGraveyard(filter));
diff --git a/Mage.Sets/src/mage/cards/s/StalwartValkyrie.java b/Mage.Sets/src/mage/cards/s/StalwartValkyrie.java
index 017e5fd4f48..bf6237d50a3 100644
--- a/Mage.Sets/src/mage/cards/s/StalwartValkyrie.java
+++ b/Mage.Sets/src/mage/cards/s/StalwartValkyrie.java
@@ -30,7 +30,7 @@ public final class StalwartValkyrie extends CardImpl {
 
         // You may pay {1}{W} and exile a creature card from your graveyard rather than pay this spell's mana cost.
         Ability ability = new AlternativeCostSourceAbility(new ManaCostsImpl<>("{1}{W}"));
-        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)));
+        ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A)));
         this.addAbility(ability);
 
         // Flying
diff --git a/Mage.Sets/src/mage/cards/v/VaultRobber.java b/Mage.Sets/src/mage/cards/v/VaultRobber.java
index a3a82ce67eb..aecde75dceb 100644
--- a/Mage.Sets/src/mage/cards/v/VaultRobber.java
+++ b/Mage.Sets/src/mage/cards/v/VaultRobber.java
@@ -36,7 +36,7 @@ public final class VaultRobber extends CardImpl {
         );
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(
-                StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD
+                StaticFilters.FILTER_CARD_CREATURE_A
         )));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/w/WeighDown.java b/Mage.Sets/src/mage/cards/w/WeighDown.java
index abefc667599..cac0808109c 100644
--- a/Mage.Sets/src/mage/cards/w/WeighDown.java
+++ b/Mage.Sets/src/mage/cards/w/WeighDown.java
@@ -21,7 +21,7 @@ public final class WeighDown extends CardImpl {
 
         // As an additional cost to cast this spell, exile a creature card from your graveyard.
         this.getSpellAbility().addCost(new ExileFromGraveCost(
-                new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)
+                new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_A)
         ));
 
         // Target creature gets -3/-3 until end of turn.