diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
index 45194ecffc8..822500b4665 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseCardNameAi.java
@@ -14,7 +14,6 @@ import forge.card.CardStateName;
 import forge.card.ICardFace;
 import forge.game.card.Card;
 import forge.game.card.CardUtil;
-import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.spellability.TargetRestrictions;
diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
index f520e046f2a..e32d09958e0 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
@@ -34,7 +34,6 @@ import forge.game.ability.AbilityFactory;
 import forge.game.ability.AbilityUtils;
 import forge.game.ability.SpellAbilityEffect;
 import forge.game.card.Card;
-import forge.game.card.CardFactory;
 import forge.game.combat.Combat;
 import forge.game.event.GameEventCombatChanged;
 import forge.game.event.GameEventTokenCreated;
diff --git a/forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt b/forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt
index f2eab822bc0..2fbc610311a 100644
--- a/forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/azor_the_lawbringer.txt
@@ -1,19 +1,16 @@
 Name:Azor, the Lawbringer
 ManaCost:2 W W U U
 Types:Legendary Creature Sphinx
-PT:6/4
+PT:6/6
 K:Flying
-
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, each opponent can't cast instant or sorcery spells during that player's next turn.
 SVar:TrigChange:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | NextTurnForEachPlayer$ True | RepeatSubAbility$ DBEffect | SpellDescription$ Each opponent can't cast instant or sorcery spells during that player's next turn.
 SVar:DBEffect:DB$ Effect | Name$ Sphinx's Decree Effect | StaticAbilities$ STCantBeCast | EffectOwner$ Remembered
 SVar:STCantBeCast:Mode$ CantBeCast | ValidCard$ Instant,Sorcery | Caster$ You | EffectZone$ Command | Description$ You can't cast instant or sorcery spells.
-
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever Azor attacks, you may pay {X}{W}{U}{U}. If you do, you gain X life and draw X cards.
 SVar:TrigDraw:AB$ GainLife | Cost$ X W U U | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and draw X cards.
 SVar:DBDraw:DB$Draw | NumCards$ X | References$ X
 SVar:X:Count$xPaid
-
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azor_the_lawbringer.jpg
 Oracle:Flying\nWhen Azor, the Lawbringer enters the battlefield, each opponent can't cast instant or sorcery spells during that player's next turn.\nWhenever Azor attacks, you may pay {X}{W}{U}{U}. If you do, you gain X life and draw X cards.
 
diff --git a/forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt b/forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt
index 3df5ed85b11..4306a8ced1b 100644
--- a/forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tetzimoc_primal_death.txt
@@ -3,7 +3,6 @@ ManaCost:4 B B
 Types:Legendary Creature Elder Dinosaur
 PT:6/6
 K:Deathtouch
-PT:2/2
 A:AB$ PutCounter | Cost$ B | ActivationZone$ Hand | CostDesc$ {B}, Reveal CARDNAME from your hand: | PlayerTurn$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ PREY | CounterNum$ 1 | IsCurse$ True | SpellDescription$ Put a prey counter on target creature. Activate this ability only during your turn.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters the battlefield, destroy each creature your opponents control with a prey counter on it.
 SVar:TrigDestroyAll:DB$ DestroyAll | ValidCards$ Creature.OppCtrl+counters_GE1_PREY