remove duplicate functions

Change-Id: I1088551dfd58923ce14dead35657e2a952b46b93
Merge remote-tracking branch 'upstream/master'