Clean the Client internals