The email address is optional and I don't think adding it is worth the complexity.
* Remove dead code and re-organize * Switch to new queries helper