Removed unused code that was based on facets definition
Merge branch 'DDBNEXT-Cleanup-Facet-Code' into develop