removed deprecated code
removed deprecated code