Tidy up joining, remove "wait" option