Fix bugs/specs broken by User activated removal.