Cleaned up server and client.