Remove AtomicWrapper and currentResult from Context