Remove duplicate email field

This is rather inefficient, but oh well.  See #2004