udpate email templates and remove dependencies