Remove obsolete function
Remove obsolete function