comment/logging cleanup