Tidied up the front end some more.  Removed some redundant classes.

Optimised imports.