Remove more obsolete functions.