Remove duplicated methods

Change-Id: Icd92a44bc9e1b55cbb10e8325f4b92404ad4a645