Some logging clean up