removed deprecated code - merge