Seems some of these functions have persistent references to them in a standard install, so we better leave them in place.