Merge pull request #7285 from eileenmcnaughton/master
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Nov 2015 19:26:11 +0000 (08:26 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 24 Nov 2015 19:26:11 +0000 (08:26 +1300)
remove some unused variables & add comments


Trivial merge