removed yield from from api commands