missed some references to removed code