Removes deprecated code
Removes deprecated code