remove modern client code.