Remove obsolete function and constant