- remove username (using email)
- tidy