General logging cleanup