Removed ensure_context