Logging clean up