[362] logging cleanup