[TaxonomiesBundle] Cleanup models to match latest changes
Merge pull request #906 from stloyd/feature/taxonomies_cleanup

[TaxonomiesBundle] Cleanup models to match latest changes