continued clean-up of action mailer config