more logging cleanups