removing given/when