Tidy up unused imports following UI-X merge

Removed unused imports