diff --git a/.gitattributes b/.gitattributes
index c14f4711503..88d06a702e3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4857,7 +4857,6 @@ res/cardsfolder/l/lys_alana_bowmaster.txt svneol=native#text/plain
 res/cardsfolder/l/lys_alana_huntmaster.txt svneol=native#text/plain
 res/cardsfolder/l/lys_alana_scarblade.txt -text
 res/cardsfolder/l/lyzolda_the_blood_witch.txt svneol=native#text/plain
-res/cardsfolder/l/veilstone_amulet.txt -text
 res/cardsfolder/m/ma_chao_western_warrior.txt svneol=native#text/plain
 res/cardsfolder/m/macabre_waltz.txt svneol=native#text/plain
 res/cardsfolder/m/macetail_hystrodon.txt svneol=native#text/plain
@@ -8983,6 +8982,7 @@ res/cardsfolder/v/vedalken_shackles.txt svneol=native#text/plain
 res/cardsfolder/v/veil_of_birds.txt svneol=native#text/plain
 res/cardsfolder/v/veiled_apparition.txt svneol=native#text/plain
 res/cardsfolder/v/veiled_serpent.txt svneol=native#text/plain
+res/cardsfolder/v/veilstone_amulet.txt -text
 res/cardsfolder/v/vein_drinker.txt svneol=native#text/plain
 res/cardsfolder/v/veinfire_borderpost.txt svneol=native#text/plain
 res/cardsfolder/v/veldrane_of_sengir.txt svneol=native#text/plain
diff --git a/res/cardsfolder/d/dralnu_lich_lord.txt b/res/cardsfolder/d/dralnu_lich_lord.txt
index b7a94f31f07..81ba1cac597 100644
--- a/res/cardsfolder/d/dralnu_lich_lord.txt
+++ b/res/cardsfolder/d/dralnu_lich_lord.txt
@@ -4,6 +4,7 @@ Types:Legendary Creature Zombie Wizard
 Text:If damage would be dealt to Dralnu, Lich Lord, sacrifice that many permanents instead.
 PT:3/3
 A:AB$Pump | Cost$ T | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | KW$ Flashback | TgtZone$ Graveyard | PumpZone$ Graveyard | SpellDescription$ Target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
+SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dralnu_lich_lord.jpg
 SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/237.jpg
diff --git a/res/cardsfolder/l/veilstone_amulet.txt b/res/cardsfolder/v/veilstone_amulet.txt
similarity index 100%
rename from res/cardsfolder/l/veilstone_amulet.txt
rename to res/cardsfolder/v/veilstone_amulet.txt
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java
index f6a96936081..226980c774b 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java
@@ -9,7 +9,6 @@ import javax.swing.JOptionPane;
 import forge.AllZone;
 import forge.Card;
 import forge.CardList;
-import forge.CardUtil;
 import forge.Constant.Zone;
 import forge.GameActionUtil;
 import forge.Player;
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
index 67d5a8f6d9d..7c4f5d1fd4d 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDebuff.java
@@ -400,7 +400,6 @@ public final class AbilityFactoryDebuff {
      */
     private static CardList getCurseCreatures(final AbilityFactory af, final SpellAbility sa,
             final ArrayList<String> kws) {
-        final Card hostCard = af.getHostCard();
         CardList list = AllZoneUtil.getCreaturesInPlay(AllZone.getHumanPlayer());
         list = list.getTargetableCards(sa);
 
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
index 53d2234e79b..378c1eefb6c 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryDestroy.java
@@ -480,7 +480,6 @@ public class AbilityFactoryDestroy {
 
         final boolean noRegen = params.containsKey("NoRegen");
         final boolean sac = params.containsKey("Sacrifice");
-        final Card card = sa.getSourceCard();
 
         ArrayList<Card> tgtCards;
         final ArrayList<Card> untargetedCards = new ArrayList<Card>();
diff --git a/src/main/java/forge/card/spellability/AbilityActivated.java b/src/main/java/forge/card/spellability/AbilityActivated.java
index 26c69e9159d..4ac12010e0e 100644
--- a/src/main/java/forge/card/spellability/AbilityActivated.java
+++ b/src/main/java/forge/card/spellability/AbilityActivated.java
@@ -73,8 +73,6 @@ public abstract class AbilityActivated extends SpellAbility implements java.io.S
             return false;
         }
 
-        final Player activator = this.getActivatingPlayer();
-
         // CantBeActivated static abilities
         final CardList allp = AllZoneUtil.getCardsIn(Zone.Battlefield);
         for (final Card ca : allp) {
diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java
index b61e9405ae8..95d21b52aed 100644
--- a/src/main/java/forge/card/spellability/Target.java
+++ b/src/main/java/forge/card/spellability/Target.java
@@ -9,7 +9,6 @@ import forge.Card;
 import forge.Constant;
 import forge.Player;
 import forge.card.abilityfactory.AbilityFactory;
-import forge.card.cardfactory.CardFactoryUtil;
 
 /**
  * <p>