Remove given/when (#12)