iterator-related cleanup