Minor cleanup of obsolete functions.