Remove unneeded  wait

+ Errors on exit remain - non-critical