cleanup more unused variables
comment from PR
Merge pull request #436 from Incubaid/cleanup

cleanup more unused variables