Remove extra deprecated code