forgot to add a removal handling