Why is Client here?

If we don't need this, we should remove it.