Some logging clean-up