rm unused vars
Merge pull request #32 from Trott/rm-unused

rm unused vars