Boosting version number up and removing deprecated code