Why is Client here?

We should probably remove these comments.