Cleanup of logging changes done in 23f6f4f67d7afdd25326e6554543e202d5395c0d