remove more dead client code