Remove marc-based facet use and cleanup