Cleanup __iter__