remove transactions and context for thread safety