#691 - ThreadLocal cleanup