remove a bunch of old code
adjustments to weight calcs in cases where nested weighted subcategories. This doesn't change actual grades.
Merge branch 'master2'