Removed use of context