Maybe if you made it so the effect had to remove it from Arcanite Witch only, rather then being able to use substitute effects like Magical Citadel of Endymion. It would be more limiting but still let you do your thing if you had the right stuff.