Removing some duplicate methods

Change-Id: I8a1295ab74890984e8d8508aaa18fd79ac2a032d
3 files changed