#691 - Add convenience method for thread local cleanup