Update email and remove old excludes