remove given/when statement