Cleanup of logging, mostly dependencies for logging