Awood/unused variables

A few fix-ups in the CalculatedAttributesUtil class.