Cleanup unused vars

Jonathan Wilkesrequested to merge
cleanup-unused-vars into master

This removes another set of unused variables.

Merge request reports