Internal logging clean up