diff --git a/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java b/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java
deleted file mode 100644
index 33be76c5cec..00000000000
--- a/Mage/src/mage/abilities/effects/common/EntersBattlefieldTappedUnlessControlsEffect.java
+++ /dev/null
@@ -1,70 +0,0 @@
-///*
-// *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
-// *
-// *  Redistribution and use in source and binary forms, with or without modification, are
-// *  permitted provided that the following conditions are met:
-// *
-// *     1. Redistributions of source code must retain the above copyright notice, this list of
-// *        conditions and the following disclaimer.
-// *
-// *     2. Redistributions in binary form must reproduce the above copyright notice, this list
-// *        of conditions and the following disclaimer in the documentation and/or other materials
-// *        provided with the distribution.
-// *
-// *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
-// *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-// *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// *
-// *  The views and conclusions contained in the software and documentation are those of the
-// *  authors and should not be interpreted as representing official policies, either expressed
-// *  or implied, of BetaSteward_at_googlemail.com.
-// */
-//
-//package mage.abilities.effects.common;
-//
-//import mage.abilities.Ability;
-//import mage.filter.FilterPermanent;
-//import mage.game.Game;
-//import mage.game.events.GameEvent;
-//
-///**
-// *
-// * @author BetaSteward_at_googlemail.com
-// */
-//public class EntersBattlefieldTappedUnlessControlsEffect extends EntersBattlefieldTappedEffect {
-//
-//	FilterPermanent filter;
-//
-//	public EntersBattlefieldTappedUnlessControlsEffect(FilterPermanent filter) {
-//		this.filter = filter;
-//	}
-//
-//	public EntersBattlefieldTappedUnlessControlsEffect(final EntersBattlefieldTappedUnlessControlsEffect effect) {
-//		super(effect);
-//		this.filter = effect.filter.copy();
-//	}
-//
-//	@Override
-//	public EntersBattlefieldTappedUnlessControlsEffect copy() {
-//		return new EntersBattlefieldTappedUnlessControlsEffect(this);
-//	}
-//
-//	@Override
-//	public boolean replaceEvent(GameEvent event, Ability source, Game game) {
-//		if (game.getBattlefield().countAll(filter, source.getControllerId()) == 0)
-//			return apply(game, source);
-//		return false;
-//	}
-//
-//	@Override
-//	public String getText(Ability source) {
-//		return super.getText(source) + " unless you control a " + filter.getMessage();
-//	}
-//
-//}
diff --git a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
index 5d058eb8532..ce8904fde79 100644
--- a/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
+++ b/Mage/src/mage/abilities/effects/common/ReturnFromExileEffect.java
@@ -35,7 +35,6 @@ import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.game.Game;
-import mage.game.events.ZoneChangeEvent;
 import mage.players.Player;
 
 /**