Remove obsolete functions