got rid of deprecated code