Remove color and model facets
Misc updates