[TaxonomiesBundle] Cleanup models to match latest changes

Replaces #884.