unify exit and neighbor removal