Initial clean-up of category list.