Remove given/when in ps