Remove some obsolete functions
Merge pull request #2863 from ke-yu/cleanup

Remove some obsolete functions