cleanup of Client, Server not in use for now