Removed more unused local variables (PMD report).

Signed-off-by: John May <john.wilkinsonmay@gmail.com>