Remove silly ceremonial code which is not needed in spec style
Simplify things
Bump version