Remove instances of context