refs #7261. Remove unused vars.
Merge branch 'bugfix/7261_edge_case' into develop