Cleanup imports and use correct logger