Remove wait group stuff since it turns out to be impractical for our needs.