Cleaning up some log noise

Previous PR #6458