Remove obsolete functions and macro.