APD-37: remove unneeded facets from fields