diff --git a/forge-gui/res/cardsfolder/c/call_of_the_nightwing.txt b/forge-gui/res/cardsfolder/c/call_of_the_nightwing.txt
index 08b66ea2d88..231d1f5d919 100644
--- a/forge-gui/res/cardsfolder/c/call_of_the_nightwing.txt
+++ b/forge-gui/res/cardsfolder/c/call_of_the_nightwing.txt
@@ -2,8 +2,7 @@ Name:Call of the Nightwing
 ManaCost:2 U B
 Types:Sorcery
 A:SP$ Token | Cost$ 2 U B | TokenAmount$ 1 | TokenName$ Horror | TokenTypes$ Creature,Horror | TokenOwner$ You | TokenColors$ Blue,Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ Cipher | SpellDescription$ Put a 1/1/ blue and black Horror creature token with flying onto the battlefield. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/call_of_the_nightwing.jpg
 Oracle:Put a 1/1 blue and black Horror creature token with flying onto the battlefield.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/h/hands_of_binding.txt b/forge-gui/res/cardsfolder/h/hands_of_binding.txt
index 28a05c867c2..8cf85905944 100644
--- a/forge-gui/res/cardsfolder/h/hands_of_binding.txt
+++ b/forge-gui/res/cardsfolder/h/hands_of_binding.txt
@@ -3,7 +3,6 @@ ManaCost:1 U
 Types:Sorcery
 A:SP$ Tap | Cost$ 1 U | ValidTgts$ Creature.OppCtrl | SubAbility$ DBPump | References$ DBPump | SpellDescription$ Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
 SVar:DBPump:DB$ Pump | Cost$ 0 | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True | SubAbility$ Cipher
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hands_of_binding.jpg
 Oracle:Tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/h/hidden_strings.txt b/forge-gui/res/cardsfolder/h/hidden_strings.txt
index d49d2183279..00353b4fc38 100644
--- a/forge-gui/res/cardsfolder/h/hidden_strings.txt
+++ b/forge-gui/res/cardsfolder/h/hidden_strings.txt
@@ -3,8 +3,7 @@ ManaCost:1 U
 Types:Sorcery
 A:SP$ TapOrUntap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SubAbility$ DBTapOrUntap | SpellDescription$ You may tap or untap target permanent, then you may tap or untap another target permanent. Cipher
 SVar:DBTapOrUntap:DB$ TapOrUntap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent (2) | TargetUnique$ True | SubAbility$ Cipher
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_strings.jpg
 Oracle:You may tap or untap target permanent, then you may tap or untap another target permanent.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/l/last_thoughts.txt b/forge-gui/res/cardsfolder/l/last_thoughts.txt
index 9c8cb7641b8..b2533c64a70 100644
--- a/forge-gui/res/cardsfolder/l/last_thoughts.txt
+++ b/forge-gui/res/cardsfolder/l/last_thoughts.txt
@@ -2,7 +2,6 @@ Name:Last Thoughts
 ManaCost:3 U
 Types:Sorcery
 A:SP$ Draw | Cost$ 3 U | Defined$ You | NumCards$ 1 | SubAbility$ Cipher | SpellDescription$ Draw a card. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/last_thoughts.jpg
 Oracle:Draw a card.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/m/mental_vapors.txt b/forge-gui/res/cardsfolder/m/mental_vapors.txt
index a2aeae59942..67b1f8ff942 100644
--- a/forge-gui/res/cardsfolder/m/mental_vapors.txt
+++ b/forge-gui/res/cardsfolder/m/mental_vapors.txt
@@ -2,7 +2,6 @@ Name:Mental Vapors
 ManaCost:3 B
 Types:Sorcery
 A:SP$ Discard | Cost$ 3 B | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ Cipher | SpellDescription$ Target player discards a card. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mental_vapors.jpg
 Oracle:Target player discards a card.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/m/midnight_recovery.txt b/forge-gui/res/cardsfolder/m/midnight_recovery.txt
index 246eec66c70..be5e4614154 100644
--- a/forge-gui/res/cardsfolder/m/midnight_recovery.txt
+++ b/forge-gui/res/cardsfolder/m/midnight_recovery.txt
@@ -2,7 +2,6 @@ Name:Midnight Recovery
 ManaCost:3 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SubAbility$ Cipher | SpellDescription$ Return target creature card from your graveyard to your hand.  Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/midnight_recovery.jpg
 Oracle:Return target creature card from your graveyard to your hand.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/p/paranoid_delusions.txt b/forge-gui/res/cardsfolder/p/paranoid_delusions.txt
index bdb19b1bdfb..18adb6ae0a6 100644
--- a/forge-gui/res/cardsfolder/p/paranoid_delusions.txt
+++ b/forge-gui/res/cardsfolder/p/paranoid_delusions.txt
@@ -2,7 +2,6 @@ Name:Paranoid Delusions
 ManaCost:U B
 Types:Sorcery
 A:SP$ Mill | Cost$ U B | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SubAbility$ Cipher | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/paranoid_delusions.jpg
 Oracle:Target player puts the top three cards of his or her library into his or her graveyard.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/s/shadow_slice.txt b/forge-gui/res/cardsfolder/s/shadow_slice.txt
index 21b852196fc..4b593dc0b63 100644
--- a/forge-gui/res/cardsfolder/s/shadow_slice.txt
+++ b/forge-gui/res/cardsfolder/s/shadow_slice.txt
@@ -2,7 +2,6 @@ Name:Shadow Slice
 ManaCost:4 B
 Types:Sorcery
 A:SP$ LoseLife | Cost$ 4 B | ValidTgts$ Opponent | LifeAmount$ 3 | SubAbility$ Cipher | SpellDescription$ Target opponent loses 3 life. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shadow_slice.jpg
 Oracle:Target opponent loses 3 life.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/s/stolen_identity.txt b/forge-gui/res/cardsfolder/s/stolen_identity.txt
index 475e9b1be49..95fd898d366 100644
--- a/forge-gui/res/cardsfolder/s/stolen_identity.txt
+++ b/forge-gui/res/cardsfolder/s/stolen_identity.txt
@@ -2,7 +2,6 @@ Name:Stolen Identity
 ManaCost:4 U U
 Types:Sorcery
 A:SP$ CopyPermanent | Cost$ 4 U U | ValidTgts$ Creature,Artifact | TgtPrompt$ Select target creature or artifact | NumCopies$ 1 | SubAbility$ Cipher | SpellDescription$ Put a token onto the battlefield that's a copy of target artifact or creature. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stolen_identity.jpg
 Oracle:Put a token onto the battlefield that's a copy of target artifact or creature.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/t/trait_doctoring.txt b/forge-gui/res/cardsfolder/t/trait_doctoring.txt
index fd2cd4600af..da1d8e6b7d6 100644
--- a/forge-gui/res/cardsfolder/t/trait_doctoring.txt
+++ b/forge-gui/res/cardsfolder/t/trait_doctoring.txt
@@ -4,8 +4,7 @@ Types:Sorcery
 A:SP$ GenericChoice | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Choose target permanent | Choices$ ChangeColor,ChangeType | Defined$ You | StackDescription$ Change the text of target permanent by replacing all instances of one color word with another or one basic land type with another until end of turn. Cipher. | SpellDescription$ Change the text of target permanent by replacing all instances of one color word with another or one basic land type with another until end of turn. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
 SVar:ChangeColor:DB$ ChangeText | Defined$ ParentTarget | ChangeColorWord$ Choose Choose | SubAbility$ Cipher | SpellDescription$ Change color
 SVar:ChangeType:DB$ ChangeText | Defined$ ParentTarget | ChangeTypeWord$ ChooseBasicLandType ChooseBasicLandType | SubAbility$ Cipher | SpellDescription$ Change type
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trait_doctoring.jpg
diff --git a/forge-gui/res/cardsfolder/u/undercity_plague.txt b/forge-gui/res/cardsfolder/u/undercity_plague.txt
index cdaedcd5495..5668a249420 100644
--- a/forge-gui/res/cardsfolder/u/undercity_plague.txt
+++ b/forge-gui/res/cardsfolder/u/undercity_plague.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ LoseLife | Cost$ 4 B B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 1 | SubAbility$ DBDiscard | SpellDescription$ Target player loses 1 life, discards a card, then sacrifices a permanent. Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
 SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ DBSacPermanent
 SVar:DBSacPermanent:DB$ Sacrifice | Defined$ Targeted | SacValid$ Permanent | Amount$ 1 | SubAbility$ Cipher
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undercity_plague.jpg
 Oracle:Target player loses 1 life, discards a card, then sacrifices a permanent.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/v/voidwalk.txt b/forge-gui/res/cardsfolder/v/voidwalk.txt
index d6e55191e82..78e3fdc3a79 100644
--- a/forge-gui/res/cardsfolder/v/voidwalk.txt
+++ b/forge-gui/res/cardsfolder/v/voidwalk.txt
@@ -4,7 +4,6 @@ Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 U | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature | RememberTargets$ True | ForgetOtherTargets$ True | TgtPrompt$ Select target creature | SubAbility$ DelTrig | SpellDescription$ Exile target creature. Return that card to the battlefield under its owner's control at end of turn.  Cipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return exiled card to the battlefield. | SubAbility$ Cipher
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:Picture:http://www.wizards.com/global/images/magic/general/voidwalk.jpg
 Oracle:Exile target creature. Return it to the battlefield under its owner's control at the beginning of the next end step.\nCipher (Then you may exile this spell card encoded on a creature you control. Whenever that creature deals combat damage to a player, its controller may cast a copy of the encoded card without paying its mana cost.)
diff --git a/forge-gui/res/cardsfolder/w/whispering_madness.txt b/forge-gui/res/cardsfolder/w/whispering_madness.txt
index 347f6c9f644..0312e380f48 100644
--- a/forge-gui/res/cardsfolder/w/whispering_madness.txt
+++ b/forge-gui/res/cardsfolder/w/whispering_madness.txt
@@ -7,8 +7,7 @@ SVar:MadnessSaveAmount:DB$ StoreSVar | SVar$ MaxDiscard | Type$ CountSVar | Expr
 SVar:MadnessCleanUp:DB$ Cleanup | ClearRemembered$ True
 SVar:MadnessDraw:DB$ Draw | Defined$ Player | NumCards$ MaxDiscard | SubAbility$ MadnessReset
 SVar:MadnessReset:DB$ StoreSVar | SVar$ MaxDiscard | Type$ Number | Expression$ 0 | SubAbility$ Cipher
-SVar:Cipher:DB$ Encode | Defined$ Self | ConditionCheckSVar$ IsEncoded | ConditionSVarCompare$ EQ0
-SVar:IsEncoded:Number$0
+SVar:Cipher:DB$ Encode | Defined$ Self
 SVar:NumDiscard:Count$RememberedSize/Minus.1
 SVar:MaxDiscard:Number$0
 SVar:RemAIDeck:True