Improvement/3.x/logging cleanup