client: remove duplicated code