[TaxonomiesBundle] Cleanup models to match latest changes