Remove more facets code