Replaced removal zone lists with sets.