re-name function to avoid conflict
remove upei specific function
Merge pull request #104 from nhart/6.x

Rename function to avoid conflict and remove dead code used by upei