diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 66fc5aadb37..8df76117295 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -1460,8 +1460,7 @@ public class Card extends GameEntity implements Comparable<Card> {
         int i = 0;
         for (KeywordInterface inst : keywords) {
             String keyword = inst.getOriginal();
-            if (keyword.startsWith("CantEquip")
-                    || keyword.startsWith("SpellCantTarget")) {
+            if (keyword.startsWith("SpellCantTarget")) {
                 continue;
             }
             // format text changes
@@ -5199,18 +5198,6 @@ public class Card extends GameEntity implements Comparable<Card> {
         if (!isCreature() || !isInPlay()) {
             return false;
         }
-
-        for(KeywordInterface inst : equip.getKeywords()) {
-            String kw = inst.getOriginal();
-            if(!kw.startsWith("CantEquip")) {
-                continue;
-            }
-            final String[] k = kw.split(":");
-            final String[] restrictions = k[1].split(",");
-            if (isValid(restrictions, equip.getController(), equip, null)) {
-                return false;
-            }
-        }
         return true;
     }
 
@@ -5219,7 +5206,6 @@ public class Card extends GameEntity implements Comparable<Card> {
         if (!isLand() || !isInPlay() || fort.isLand()) {
             return false;
         }
-
         return true;
     }
 
diff --git a/forge-gui/res/cardsfolder/g/gate_smasher.txt b/forge-gui/res/cardsfolder/g/gate_smasher.txt
index 212b19472a4..d1429cb30f7 100644
--- a/forge-gui/res/cardsfolder/g/gate_smasher.txt
+++ b/forge-gui/res/cardsfolder/g/gate_smasher.txt
@@ -1,9 +1,8 @@
 Name:Gate Smasher
 ManaCost:3
 Types:Artifact Equipment
-Text:CARDNAME can be attached only to a creature with toughness 4 or greater.
 K:Equip:3
-K:CantEquip:Creature.toughnessLT4
+S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.toughnessLT4 | Description$ CARDNAME can be attached only to a creature with toughness 4 or greater.
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample.
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gate_smasher.jpg
diff --git a/forge-gui/res/cardsfolder/k/kondas_banner.txt b/forge-gui/res/cardsfolder/k/kondas_banner.txt
index ac73ead1a79..47ff7eb36fc 100644
--- a/forge-gui/res/cardsfolder/k/kondas_banner.txt
+++ b/forge-gui/res/cardsfolder/k/kondas_banner.txt
@@ -1,9 +1,8 @@
 Name:Konda's Banner
 ManaCost:2
 Types:Legendary Artifact Equipment
-Text:CARDNAME can be attached only to a legendary creature.
-K:CantEquip:Creature.nonLegendary
 K:Equip:2
+S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.nonLegendary | Description$ CARDNAME can be attached only to a legendary creature.
 S:Mode$ Continuous | Affected$ Creature.SharesColorWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a color with equipped creature get +1/+1.
 S:Mode$ Continuous | Affected$ Creature.sharesCreatureTypeWith Equipped | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures that share a creature type with equipped creature get +1/+1.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/o/o_naginata.txt b/forge-gui/res/cardsfolder/o/o_naginata.txt
index 7e011d54025..f539a4b5d09 100644
--- a/forge-gui/res/cardsfolder/o/o_naginata.txt
+++ b/forge-gui/res/cardsfolder/o/o_naginata.txt
@@ -1,9 +1,8 @@
 Name:O-Naginata
 ManaCost:1
 Types:Artifact Equipment
-Text:CARDNAME can be attached only to a creature with power 3 or greater.
 K:Equip:2
-K:CantEquip:Creature.powerLT3
+S:Mode$ CantAttach | ValidCard$ Card.Self | Target$ Creature.powerLT3 | Description$ CARDNAME can be attached only to a creature with power 3 or greater.
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddKeyword$ Trample | Description$ Equipped creature gets +3/+0 and has trample.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/o_naginata.jpg
 Oracle:O-Naginata can be attached only to a creature with power 3 or greater.\nEquipped creature gets +3/+0 and has trample.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)