Use plugin logger
Cleanup