Remove unused function

Change-Id: Ia43acf3f0a1121a85a6436de7baa7b53e8233eb8
Merge "Remove unused function"