update mail address
remove some old cruft
Revert "remove some old cruft"

This reverts commit 17cb33b8f9e44cf33097b5a153c4eb7e06e0c004.