Make extra sure that ThreadLocal references are removed, even in the current Thread