Remove unused argument and last remaining wait