Removed client implementation