Removing the long-lived data context to beat the context tracking issues. Closes #218