Added email getter
Removed unneeded stuffs