Removed dependency between client and server.