Final Build - Email Remove