Removed unused class from Client