Version & removed deprecated code