Removed a bunch of unused local variables (PMD reports)