Revert "cleanout, simplify"

This reverts commit 1c84fe0569260ddd2b795e776966130b9a8de77a.
Revert "google signup"

This reverts commit 53afd5ce89a59c87d96f6b194ed44dac25ba8ede.
use email address as server name