Clean up the client.
Further clean up the client.