remove do_~functions in client & modify some valuenames