Delete some deprecated code from master