clean up some log noise with an optional flag