Remove more references to mailouts from base code