remove non-client code