Tidy up unused imports following UI-X merge
Merge pull request #621 from cdjackson/UI-X-Tidy

Tidy up unused imports following UI-X merge