right/tag cleanup, plus mailer cleanup