[BZ 1069545] First cut at removing the predefined subcategories concept. This version has some functionality removed but will be added in later revisions.