CB-6961 cleaned up logging