Tidy up unused imports