Remove given/when and smatmatch
Release 1.05