Remove unused functions
Merge pull request #6746 from wmtan/RemoveUnusedFunctions

Remove unused functions to avoid build warning