removing unused client code