diff --git a/res/cardsfolder/vedalken_mastermind.txt b/res/cardsfolder/vedalken_mastermind.txt
index 0e6fc536de0..1296d7a8216 100644
--- a/res/cardsfolder/vedalken_mastermind.txt
+++ b/res/cardsfolder/vedalken_mastermind.txt
@@ -3,6 +3,7 @@ ManaCost:U U
 Types:Creature Vedalken Wizard
 Text:no text
 PT:1/2
+A:AB$Bounce |Cost$ U T | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | Destination$ Hand | SpellDescription$ Return target permanent you control to its owner's hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/5dn/en-us/card50834.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/40.jpg
diff --git a/res/cardsfolder/wayward_soul.txt b/res/cardsfolder/wayward_soul.txt
index e1ca998dff1..36b09c9b6fb 100644
--- a/res/cardsfolder/wayward_soul.txt
+++ b/res/cardsfolder/wayward_soul.txt
@@ -4,6 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/2
 K:Flying
+A:AB$Bounce | Cost$ U |  Destination$ TopofLibrary | SpellDescription$ Put CARDNAME on top of its owner's library.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/ex/en-us/card5273.jpg
 SetInfo:EXO|Common|http://magiccards.info/scans/en/ex/51.jpg
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 87287c8e4b4..f8d487aace9 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -5962,7 +5962,7 @@ public class CardFactory_Creatures {
             ability.setStackDescription(sbStack.toString());
         }//*************** END ************ END ************************** 
 
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Vedalken Mastermind")) {
             //mana tap ability
@@ -5999,7 +5999,7 @@ public class CardFactory_Creatures {
             ability.setDescription("U, tap: Return target permanent you control to its owner's hand.");
             ability.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
-        
+        */
 
         //*************** START *********** START **************************
         else if(cardName.equals("Helldozer")) {
@@ -6064,125 +6064,8 @@ public class CardFactory_Creatures {
             ability.setDescription("BBB, tap: Destroy target land. If that land is nonbasic, untap Helldozer.");
             ability.setBeforePayMana(CardFactoryUtil.input_targetType(ability, "Land"));
         }//*************** END ************ END **************************
-        
-        /*
-        //*************** START *********** START **************************
-        else if(cardName.equals("Cao Cao, Lord of Wei")) {
-            //mana tap ability
-            final Ability_Tap ability = new Ability_Tap(card, "0") {
-                private static final long serialVersionUID = 6760838700101179614L;
-                
-                @Override
-                public void chooseTargetAI() {
-                    card.tap();
-                }
-                
-                @Override
-                public boolean canPlayAI() {
-                    int hand = AllZone.Human_Hand.getCards().length;
-                    if((!CardFactoryUtil.AI_doesCreatureAttack(card)) && hand != 0) return true;
-                    
-                    return 2 <= hand;
-                }
-                
-                @Override
-                public void resolve() {
-                    Player player = card.getController().getOpponent();
-                    player.discard(2, this);
-                    
-                    //if(player.equals(AllZone.HumanPlayer)) AllZone.InputControl.setInput(CardFactoryUtil.input_discard(2, this));
-                    //else {
-                     //   AllZone.GameAction.discardRandom(player, this);
-                      //  AllZone.GameAction.discardRandom(player, this);
-                    //}
-                }//resolve()
-                
-                @Override
-                public boolean canPlay() {
-                    Player opp = card.getController().getOpponent();
-                    
-                    StringBuilder sb = new StringBuilder();
-                    sb.append(card.getName()).append(" - ").append(opp).append(" discards 2 cards");
-                    setStackDescription(sb.toString());
-                    
-                    String phase = AllZone.Phase.getPhase();
-                    Player activePlayer = AllZone.Phase.getPlayerTurn();
-                    
-                    return super.canPlay() && phase.equals(Constant.Phase.Main1)
-                            && card.getController().equals(activePlayer);
-                }
-            };//SpellAbility
-            
-            ability.setChooseTargetAI(CardFactoryUtil.AI_targetHuman());
-            ability.setDescription("tap: Target opponent discards two cards. Play this ability only during your turn, before the combat phase.");
-            ability.setBeforePayMana(new Input_NoCost_TapAbility(ability));
-            
-            card.addSpellAbility(ability);
-        }//*************** END ************ END **************************
-        */
-        
-        /*
-        //*************** START *********** START **************************
-        else if(cardName.equals("Gwendlyn Di Corci")) {
-            //mana tap ability
-            final Ability_Tap ability = new Ability_Tap(card, "0") {
-                
-                private static final long serialVersionUID = -4211234606012596777L;
-                
-                @Override
-                public void chooseTargetAI() {
-                    setTargetPlayer(AllZone.HumanPlayer);
-                }
-                
-                @Override
-                public boolean canPlayAI() {
-                    int hand = AllZone.Human_Hand.getCards().length;
-                    return hand > 0;
-                }
-                
-                @Override
-                public void resolve() {
-                    Player player = getTargetPlayer();
-                    
-                    player.discardRandom(this);
-                    
-                }//resolve()
-                
-                @Override
-                public boolean canPlay() {
-                	
-                	StringBuilder sb = new StringBuilder();
-                	sb.append(card.getName()).append(" - ").append(getTargetPlayer()).append(" discards a card at random.");
-                	setStackDescription(sb.toString());
-                    
-                    Player activePlayer = AllZone.Phase.getPlayerTurn();
-                    
-                    return super.canPlay() && card.getController().equals(activePlayer);
-                }
-            };//SpellAbility
-            
-            Input input = new Input() {
-                private static final long serialVersionUID = 3312693459353844120L;
-                
-                @Override
-                public void showMessage() {
-                    //prevents this from running multiple times, which it is for some reason
-                    if(ability.getSourceCard().isUntapped()) {
-                        ability.getSourceCard().tap();
-                        stopSetNext(CardFactoryUtil.input_targetPlayer(ability));
-                    }
-                }
-            };
-            
-            ability.setDescription("Tap: Target player discards a card at random. Activate this ability only during your turn.");
-            ability.setBeforePayMana(input);
-            //ability.setBeforePayMana(CardFactoryUtil.input_targetPlayer(ability));
-            
-            card.addSpellAbility(ability);
-        }//*************** END ************ END **************************
-        */
                
-
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Wayward Soul")) {
             //mana ability
@@ -6230,6 +6113,7 @@ public class CardFactory_Creatures {
             card.addSpellAbility(ability);
             ability.setBeforePayMana(runtime);
         }//*************** END ************ END **************************
+        */
         
 
         //*************** START *********** START **************************