Remove thread_local storage