Hotfix - remove thread-safe stuff for now