remove unused code
add email regular expression