Get rid of the category system