Request to merge email branch

If code is not being used, it shouldn't be committed.