A lot more tidying. Email now works.

Also remove DFG.