Remove obsolete functions (as top levels)