Now using iterator for identifier removal