remove support for context