usage of deprecated code removed