diff --git a/Mage.Sets/src/mage/sets/apocalypse/DwarvenLandslide.java b/Mage.Sets/src/mage/sets/apocalypse/DwarvenLandslide.java
index ae363fd9ff..fbe7dd5c91 100644
--- a/Mage.Sets/src/mage/sets/apocalypse/DwarvenLandslide.java
+++ b/Mage.Sets/src/mage/sets/apocalypse/DwarvenLandslide.java
@@ -75,7 +75,8 @@ public class DwarvenLandslide extends CardImpl {
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SpellAbility) {
             if (KickedCondition.getInstance().apply(game, ability)) {
-                getSpellAbility().addTarget(new TargetLandPermanent(new FilterLandPermanent("land (Kicker)")));
+                ability.getTargets().clear();
+                getSpellAbility().addTarget(new TargetLandPermanent(2));
             }
         }
     }
diff --git a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java
index ce9e8d2015..945a984314 100644
--- a/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java
+++ b/Mage.Sets/src/mage/sets/darkascension/BloodFeud.java
@@ -50,16 +50,7 @@ public class BloodFeud extends CardImpl {
 
         // Target creature fights another target creature.
         this.getSpellAbility().addEffect(new FightTargetsEffect());
-        
-        TargetCreaturePermanent target = new TargetCreaturePermanent();
-        target.setTargetTag(1);
-        this.getSpellAbility().addTarget(target);
-        
-        FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature to fight");
-        filter.add(new AnotherTargetPredicate(2));
-        TargetCreaturePermanent target2 = new TargetCreaturePermanent(filter);
-        target2.setTargetTag(2);
-        this.getSpellAbility().addTarget(target2);
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(2));
     }
 
     public BloodFeud(final BloodFeud card) {
diff --git a/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java b/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java
index 34b0cee256..68396e02c7 100644
--- a/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java
+++ b/Mage.Sets/src/mage/sets/planeshift/RushingRiver.java
@@ -75,7 +75,8 @@ public class RushingRiver extends CardImpl {
     @Override
     public void adjustTargets(Ability ability, Game game) {
         if (ability instanceof SpellAbility && KickedCondition.getInstance().apply(game, ability)) {
-            ability.addTarget(new TargetOtherNonlandPermanent(new FilterNonlandPermanent("another target nonland permanent")));
+            ability.getTargets().clear();
+            ability.addTarget(new TargetNonlandPermanent(2));
         }
 
     }
@@ -89,27 +90,3 @@ public class RushingRiver extends CardImpl {
         return new RushingRiver(this);
     }
 }
-
-class TargetOtherNonlandPermanent extends TargetNonlandPermanent {
-
-    public TargetOtherNonlandPermanent(FilterNonlandPermanent filter) {
-        super(filter);
-    }
-
-    public TargetOtherNonlandPermanent(final TargetOtherNonlandPermanent target) {
-        super(target);
-    }
-
-    @Override
-    public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
-        if (source.getTargets().get(0).getTargets().contains(id)) {
-            return false;
-        }
-        return super.canTarget(controllerId, id, source, game);
-    }
-
-    @Override
-    public TargetOtherNonlandPermanent copy() {
-        return new TargetOtherNonlandPermanent(this);
-    }
-}
diff --git a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DissensionInTheRanks.java b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DissensionInTheRanks.java
index a3f12cdc13..264313b291 100644
--- a/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DissensionInTheRanks.java
+++ b/Mage.Sets/src/mage/sets/shadowsoverinnistrad/DissensionInTheRanks.java
@@ -56,8 +56,7 @@ public class DissensionInTheRanks extends CardImpl {
 
         // Target blocking creature fights another target blocking creature.
         this.getSpellAbility().addEffect(new FightTargetsEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
-        this.getSpellAbility().addTarget(new DissensionInTheRanksTarget(filter));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, 2, filter, false));
 
     }
 
@@ -70,28 +69,3 @@ public class DissensionInTheRanks extends CardImpl {
         return new DissensionInTheRanks(this);
     }
 }
-
-class DissensionInTheRanksTarget extends TargetCreaturePermanent {
-
-    public DissensionInTheRanksTarget(FilterCreaturePermanent filter) {
-        super(1, 1, filter, false);
-    }
-
-    public DissensionInTheRanksTarget(final DissensionInTheRanksTarget target) {
-        super(target);
-    }
-
-    @Override
-    public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {
-        if (source.getTargets().get(0).getTargets().contains(id)) {
-            return false;
-        }
-        return super.canTarget(controllerId, id, source, game);
-    }
-
-    @Override
-    public DissensionInTheRanksTarget copy() {
-        return new DissensionInTheRanksTarget(this);
-    }
-
-}