CLC-2183 Adjust log levels and comments