Finish conversion to new join task system