remove email related, ready to rewite so many things