Update email and fix build and remove.
Merge pull request #1858 from Chattered/master

Update email and fix build and remove.