Cleaning up HasStateMailer