Don't re-iterate the list for removal

Change-Id: I23f517be9c5f2e5754b3eaa9067233899ad87a35