(Email) Remove trailing code