Remove duplicated methods
CC @lizlux