grape related code removed