Delete deprecated code from master