Remove unused imports
Improve log messages and levels