less debug noise
Cleanup in logging