Removed code unrelated to the yield