Thinning down the client.

Signed-off-by: Morgan Dock <morgan.dock@gmail.com>