Removed client factory