Really clean up the client class