Removed unused vars.

requested review from @kepol

assigned to @alan.cole

This looks good. Note here is the d.o issue where it was highlighted.

approved this merge request

started a merge train

The merge failed via GitLab so I did via commandline.

closed