removed yield-statements