Removed misleading client class