Remove CMS dependency and update email.