Remove deprecated code
Remove deprecated code