-136 lines of worthless code. Even if the idea was hypothetically good, which I...

-136 lines of worthless code.  Even if the idea was hypothetically good, which I'm not sure of, nobody is using CategoryList anywhere and I don't foresee any use for it.  Also makes what remains considerably easier to read (no looping, etc.).  This seems to work correctly, but I might have missed something somewhere, so be on the lookout.