Looks like the waits are not needed, worked fine for me without them.