Remove more obsolete code dealing with categories (bug 1058292)