diff --git a/forge-gui/res/cardsfolder/m/maddening_imp.txt b/forge-gui/res/cardsfolder/m/maddening_imp.txt
index 4086824a47c..d550666a8bf 100644
--- a/forge-gui/res/cardsfolder/m/maddening_imp.txt
+++ b/forge-gui/res/cardsfolder/m/maddening_imp.txt
@@ -3,10 +3,10 @@ ManaCost:2 B
 Types:Creature Imp
 PT:1/1
 K:Flying
-A:AB$ PumpAll | Cost$ T | ValidCards$ Creature.ActivePlayerCtrl+nonWall | KW$ HIDDEN CARDNAME attacks each combat if able. | ActivationPhases$ Upkeep->Main1 | OpponentTurn$ True | RememberAllPumped$ True | SubAbility$ DestroyPacifist | SpellDescription$ Non-Wall creatures the active player controls attack this turn if able. At the beginning of the next end step, destroy each of those creatures that didn't attack this turn. Activate this ability only during an opponent's turn and only before combat.
-SVar:DestroyPacifist:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the next end step, destroy each of those creatures that didn't attack this turn.
-SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.IsRemembered+notAttackedThisTurn | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ PumpAll | Cost$ T | ValidCards$ Creature.ActivePlayerCtrl+nonWall | KW$ HIDDEN CARDNAME attacks each combat if able. | ActivationPhases$ Upkeep->Main1 | OpponentTurn$ True | SubAbility$ DBEffect | StackDescription$ SpellDescription | SpellDescription$ Non-Wall creatures the active player controls attack this turn if able. At the beginning of the next end step, destroy each of those creatures that didn't attack this turn. Activate this ability only during an opponent's turn and only before combat.
+SVar:DBEffect:DB$ Effect | Name$ Maddening Imp Effect | Triggers$ EndofTurn | SVars$ TrigDestroy | RememberObjects$ Valid Creature.ActivePlayerCtrl+nonWall
+SVar:EndofTurn:Mode$ Phase | Phase$ End of Turn | Execute$ TrigDestroy | TriggerDescription$ At the beginning of the next end step, destroy each of those creatures that didn't attack this turn.
+SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.IsRemembered+notAttackedThisTurn
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
 SVar:NonCombatPriority:5