Remove email instructions/reference. Closes #6140.

- cleanup some code,
- remove unused import,
- pep8 fixes