Facet cleanup; basic metadata cleanup