removed old client code