Merge pull request #965 from TheBlueMatt/2021-06-log-cleanups