Remove client code