fixed facets cleanup