Simplify client, no need to instantiate it.