remove duplicate functions

Change-Id: I3e47aa858e8f29a8cd5db550a9d4540b5d3e89fd