more logging clean up