remove unnecessary reference to context