Revert "cleanup of the version .2, getting ready for version .3"

This reverts commit fb89c4ff63539ac4defa2e533a4f266f6b5b68ce.
Revert "Revert "cleanup of the version .2, getting ready for version .3""

This reverts commit 71ecc338a63d802f90a4d72f79e95d4ede6fa531.