diff --git a/res/cardsfolder/crypt_cobra.txt b/res/cardsfolder/crypt_cobra.txt
index 3346f4e8f00..8495e65a555 100644
--- a/res/cardsfolder/crypt_cobra.txt
+++ b/res/cardsfolder/crypt_cobra.txt
@@ -1,8 +1,10 @@
 Name:Crypt Cobra
 ManaCost:3 B
 Types:Creature Snake
-Text:Whenever Crypt Cobra attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+Text:no text
 PT:3/3
+T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_cobra.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/12.jpg
diff --git a/res/cardsfolder/suqata_assassin.txt b/res/cardsfolder/suqata_assassin.txt
index a35158ce1d7..ae2fc05a622 100644
--- a/res/cardsfolder/suqata_assassin.txt
+++ b/res/cardsfolder/suqata_assassin.txt
@@ -1,9 +1,11 @@
 Name:Suq'Ata Assassin
 ManaCost:1 B B
 Types:Creature Human Assassin
-Text:Whenever Suq'Ata Assassin attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+Text:no text
 PT:1/1
 K:Fear
+T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/suqata_assassin.jpg
 SetInfo:VIS|Uncommon|http://magiccards.info/scans/en/vi/19.jpg
diff --git a/res/cardsfolder/swamp_mosquito.txt b/res/cardsfolder/swamp_mosquito.txt
index 06c20e8a3e9..bcc528aab77 100644
--- a/res/cardsfolder/swamp_mosquito.txt
+++ b/res/cardsfolder/swamp_mosquito.txt
@@ -1,9 +1,11 @@
 Name:Swamp Mosquito
 ManaCost:1 B
 Types:Creature Insect
-Text:Whenever Swamp Mosquito attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+Text:no text
 PT:0/1
 K:Flying
+T:Mode$ AttackerUnblocked | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPoison | TriggerDescription$ Whenever CARDNAME attacks and isn't blocked, defending player gets a poison counter. (A player with ten or more poison counters loses the game.)
+SVar:TrigPoison:AB$Poison | Cost$ 0 | Defined$ Opponent | Num$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swamp_mosquito.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/30.jpg|2
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 75833b07229..0ae6ec6f676 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -2058,13 +2058,6 @@ public class CombatUtil {
             
             AllZone.Stack.add(ability2);
             
-        } else if(c.getName().equals("Crypt Cobra") || c.getName().equals("Suq'Ata Assassin")
-                || c.getName().equals("Swamp Mosquito")) {
-            Player controller = c.getController();
-            Player opp = controller.getOpponent();
-            
-            if(opp.equals(AllZone.HumanPlayer)) AllZone.HumanPlayer.addPoisonCounters(1);
-            else AllZone.ComputerPlayer.addPoisonCounters(1);
         }
         
     }