Remove use of some obsolete functions