kill some duplicated code!