Remove some unused variables.
Merge pull request #62 from mdeters/bv-cleanup

Remove some unused variables.