Removed some old client code