Remove WaitGroup from connection