Revert "EmailVerification v2.0"

This reverts commit bf77a5ce75669f725d3709575027e5f6bffc4af8.