Add more cleanup in consumer.stop()