CLC-2173 Logging cleanup