Review logging, some code tidy up

[trnguyencflt]

This is as part of reviewing our logging, I have checked across the repository and confirm that we don't log configuration.