diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 8e12e022d6d..22e767640db 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -6769,258 +6769,6 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(CardFactoryUtil.input_targetCreature_NoCost_TapAbility_NoTargetSelf(ability));
         }//*************** END ************ END **************************
         
-        /* converted to keyword   
-        //*************** START *********** START **************************
-        else if(cardName.equals("Tetsuo Umezawa")) {
-            //tap ability - no cost - target creature
-            
-            final Ability_Tap ability = new Ability_Tap(card) {
-                
-                private static final long serialVersionUID = -8034678094689484203L;
-                
-                @Override
-                public void resolve() {
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    
-                    if(AllZone.GameAction.isCardInPlay(getTargetCard())
-                            && CardFactoryUtil.canTarget(card, getTargetCard())
-                            && (blockers.contains(getTargetCard()) || getTargetCard().isTapped())) {
-                        AllZone.GameAction.destroy(getTargetCard());
-                    }
-                }//resolve()
-                
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-            };//SpellAbility
-            
-            Input target = new Input() {
-                
-                private static final long serialVersionUID = -1939019440028116051L;
-                
-                @Override
-                public void showMessage() {
-                    AllZone.Display.showMessage("Select target tapped or blocking creature.");
-                    ButtonUtil.enableOnlyCancel();
-                }
-                
-                @Override
-                public void selectButtonCancel() {
-                    stop();
-                }
-                
-                @Override
-                public void selectCard(Card card, PlayerZone zone) {
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    if(card.isCreature() && zone.is(Constant.Zone.Play)
-                            && (blockers.contains(card) || card.isTapped())) {
-                        ability.setTargetCard(card);
-                        stopSetNext(new Input_NoCost_TapAbility(ability));
-                    }
-                }
-            };
-            
-            card.addSpellAbility(ability);
-            ability.setDescription("U B B R, Tap: Destroy target tapped or blocking creature.");
-            
-            ability.setBeforePayMana(target);
-        }//*************** END ************ END **************************
-        
-
-        //*************** START *********** START **************************
-        else if(cardName.equals("Tor Wauki")) {
-            //tap ability - no cost - target creature
-            
-            final Ability_Tap ability = new Ability_Tap(card) {
-                
-                private static final long serialVersionUID = -8034678094689484203L;
-                
-                @Override
-                public void resolve() {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    attackers.add(AllZone.pwCombat.getAllBlockers());
-                    
-                    if(AllZone.GameAction.isCardInPlay(getTargetCard())
-                            && CardFactoryUtil.canTarget(card, getTargetCard())
-                            && (attackers.contains(getTargetCard()) || blockers.contains(getTargetCard()))) {
-                        getTargetCard().addDamage(2, card);
-                    }
-                }//resolve()
-                
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-            };//SpellAbility
-            
-            Input target = new Input() {
-                
-                private static final long serialVersionUID = -1939019440028116051L;
-                
-                @Override
-                public void showMessage() {
-                    AllZone.Display.showMessage("Select target attacking or blocking creature.");
-                    ButtonUtil.enableOnlyCancel();
-                }
-                
-                @Override
-                public void selectButtonCancel() {
-                    stop();
-                }
-                
-                @Override
-                public void selectCard(Card card, PlayerZone zone) {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    blockers.add(AllZone.pwCombat.getAllBlockers());
-                    
-                    if(card.isCreature() && zone.is(Constant.Zone.Play)
-                            && (attackers.contains(card) || blockers.contains(card))) {
-                        ability.setTargetCard(card);
-                        stopSetNext(new Input_NoCost_TapAbility(ability));
-                    }
-                }
-            };
-            
-            card.addSpellAbility(ability);
-            ability.setDescription("tap: Tor Wauki deals 2 damage to target attacking or blocking creature.");
-            
-            ability.setBeforePayMana(target);
-        }//*************** END ************ END **************************
-        
-
-        //*************** START *********** START **************************
-        else if(cardName.equals("Lady Caleria")) {
-            //tap ability - no cost - target creature
-            
-            final Ability_Tap ability = new Ability_Tap(card) {
-                
-                private static final long serialVersionUID = -8034678094689484203L;
-                
-                @Override
-                public void resolve() {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    blockers.add(AllZone.pwCombat.getAllBlockers());
-                    
-                    if(AllZone.GameAction.isCardInPlay(getTargetCard())
-                            && CardFactoryUtil.canTarget(card, getTargetCard())
-                            && (attackers.contains(getTargetCard()) || blockers.contains(getTargetCard()))) {
-                        getTargetCard().addDamage(3, card);
-                    }
-                }//resolve()
-                
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-            };//SpellAbility
-            
-            Input target = new Input() {
-                
-                private static final long serialVersionUID = -1939019440028116051L;
-                
-                @Override
-                public void showMessage() {
-                    AllZone.Display.showMessage("Select target attacking or blocking creature.");
-                    ButtonUtil.enableOnlyCancel();
-                }
-                
-                @Override
-                public void selectButtonCancel() {
-                    stop();
-                }
-                
-                @Override
-                public void selectCard(Card card, PlayerZone zone) {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    CardList blockers = AllZone.Combat.getAllBlockers();
-                    blockers.add(AllZone.pwCombat.getAllBlockers());
-                    if(card.isCreature() && zone.is(Constant.Zone.Play)
-                            && (attackers.contains(card) || blockers.contains(card))) {
-                        ability.setTargetCard(card);
-                        stopSetNext(new Input_NoCost_TapAbility(ability));
-                    }
-                }
-            };
-            
-            card.addSpellAbility(ability);
-            ability.setDescription("tap: Lady Caleria deals 3 damage to target attacking or blocking creature.");
-            
-            ability.setBeforePayMana(target);
-        }//*************** END ************ END **************************
-        
-      
-        //*************** START *********** START **************************
-        else if(cardName.equals("Femeref Archers")) {
-            //tap ability - no cost - target creature
-            
-            final Ability_Tap ability = new Ability_Tap(card) {
-                
-                private static final long serialVersionUID = -4369831076920644547L;
-                
-                @Override
-                public void resolve() {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    
-                    if(AllZone.GameAction.isCardInPlay(getTargetCard())
-                            && CardFactoryUtil.canTarget(card, getTargetCard())
-                            && attackers.contains(getTargetCard())
-                            && getTargetCard().getKeyword().contains("Flying")) {
-                        getTargetCard().addDamage(4, card);
-                    }
-                }//resolve()
-                
-                @Override
-                public boolean canPlayAI() {
-                    return false;
-                }
-            };//SpellAbility
-            
-            Input target = new Input() {
-                
-                private static final long serialVersionUID = 3455890565752527632L;
-                
-                @Override
-                public void showMessage() {
-                    AllZone.Display.showMessage("Select target attacking creature with flying.");
-                    ButtonUtil.enableOnlyCancel();
-                }
-                
-                @Override
-                public void selectButtonCancel() {
-                    stop();
-                }
-                
-                @Override
-                public void selectCard(Card card, PlayerZone zone) {
-                    CardList attackers = new CardList(AllZone.Combat.getAttackers());
-                    attackers.addAll(AllZone.pwCombat.getAttackers());
-                    if (card.isCreature() 
-                    		&& zone.is(Constant.Zone.Play) 
-                    		&& card.getKeyword().contains("Flying") 
-                            && attackers.contains(card) 
-                            && CardFactoryUtil.canTarget(ability, card)) {
-                        ability.setTargetCard(card);
-                        stopSetNext(new Input_NoCost_TapAbility(ability));
-                    }
-                }
-            };
-            
-            card.addSpellAbility(ability);
-            ability.setDescription("tap: Femeref Archers deals 4 damage to target attacking creature with flying.");
-            
-            ability.setBeforePayMana(target);
-        }//*************** END ************ END **************************
-        */
         
         //*************** START *********** START **************************
         else if(cardName.equals("Adarkar Valkyrie")) {