minor code tidyups
Merge pull request #3315 from eileenmcnaughton/codetidying

Codetidying - remove a couple of unused params