Remove unused argument and last remaining wait
Merge branch 'master' into transcode