Removed use of context params