Remove unused function

Change-Id: I370ac6103c76e0e2bb23fee807e5b6baa871e163
Merge "Remove unused function"