Cleaned up client and server.