Remove unused variables
Description
Some maintenance work removing unused variables.
News snippet
Removed unused variables
Checklist
-
I have checked that my code follows the Octopus coding standards -
I have added tests for all the new features added in this request.