remove deprecated code
remove deprecated code