Iter
cleanups