Clean up a lot of both Type and Category.