log related cleanups