Remove second yield