HCOLL-94 cleaned up logging