Remove non-core thread-local variables from InternalThreadLocalMap