Remove Context argument to keep close to hydro branch