use version::is_lax as and where
remove comments
remove some more cruff
remove commeted out code