Code Tidy

Chasing up warnings; mostly unused imports