Remove unecessary WaitGroup

No need to create a WaitGroup that waits on another WaitGroup, just combine
both.