cleaning up settings and smarter email settings