finish removing given/when construct