removed deprecated code usage