Caught some 'set but unused' variables, deleted them.