Display name added to Category enum; removed from provider.
unused associations removed