cleaning up for more direct facetdefintions
cleaning up for more direct facetdefintions