Remove unused imports
Tidy up log error messages