Cleanup, add ThreadLocalDelegator.