Removed unnecessary WaitGroup