Removed client code