First stab at name facet; cleaned up some unused code.