remove given/when, which is now possibly deprecated in 5.20