Simplifing the selection handling during model removal.