Unused variables removed
Minor variable refactorization. Build fix.