minor
Get rid of duplicated methods.