Remove deprecated references to threadsafe