Conform to name convention.
Remove unnecessary function.