Revert "Encryption&email refactor"