Removed old class for client