more logging cleanup