remove yield()