Removed Client class