Add WaitGroup to ensure consumer has sent all before removing itself

Add WaitGroup to ensure consumer has sent all before removing itself #382