Remove use of deprecated routines.