redesigned _clean methods on Client