diff --git a/forge-gui/res/cardsfolder/a/armored_skyhunter.txt b/forge-gui/res/cardsfolder/a/armored_skyhunter.txt
index c3ad3066b0e..8014a037ac8 100755
--- a/forge-gui/res/cardsfolder/a/armored_skyhunter.txt
+++ b/forge-gui/res/cardsfolder/a/armored_skyhunter.txt
@@ -6,7 +6,7 @@ K:Flying
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME attacks, look at the top six cards of your library. You may put an Aura or Equipment card from among them onto the battlefield. If an Equipment is put onto the battlefield this way, you may attach it to a creature you control. Put the rest of those cards on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Aura,Equipment | DestinationZone$ Battlefield | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True | RememberChanged$ True | SubAbility$ DBChoose
 SVar:DBChoose:DB$ ChooseCard | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control to attach the Equipment to | Optional$ Yes | Amount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | SubAbility$ DBAttachEquip
-SVar:DBAttachEquip:DB$ Attach | Object$ Remembered | Defined$ ChosenCard | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | SubAbility$ DB Cleanup
+SVar:DBAttachEquip:DB$ Attach | Object$ Remembered | Defined$ ChosenCard | ConditionDefined$ Remembered | ConditionPresent$ Equipment | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 SVar:HasAttackEffect:TRUE
 DeckHints:Type$Aura|Equipment
diff --git a/forge-gui/res/cardsfolder/g/grotag_night_runner.txt b/forge-gui/res/cardsfolder/g/grotag_night_runner.txt
index 4a7b15f08f6..8c1aec029e5 100755
--- a/forge-gui/res/cardsfolder/g/grotag_night_runner.txt
+++ b/forge-gui/res/cardsfolder/g/grotag_night_runner.txt
@@ -6,4 +6,5 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage
 SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play this card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Whenever Grotag Night-Runner deals combat damage to a player, exile the top card of your library. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/l/lucille.txt b/forge-gui/res/cardsfolder/l/lucille.txt
index 7dfc795a1e4..4758e20325c 100644
--- a/forge-gui/res/cardsfolder/l/lucille.txt
+++ b/forge-gui/res/cardsfolder/l/lucille.txt
@@ -5,5 +5,6 @@ S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ M
 T:Mode$ Attacks | ValidCard$ Card.EquippedBy | Execute$ TrigSac | TriggerDescription$ Whenever equipped creature attacks, defending player sacrifices a creature. If they do, you create a Walker token.
 SVar:TrigSac:DB$ Sacrifice | Defined$ TriggeredDefendingPlayer | SacValid$ Creature | Amount$ 1 | RememberSacrificed$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | TokenAmount$ 1 | TokenScript$ walker | TokenOwner$ You | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Equip:4
 Oracle:Equipped creature gets +2/+0 and has menace.\nWhenever equipped creature attacks, defending player sacrifices a creature. If they do, you create a Walker token.\nEquip {4}