Minor clean ups

Remove redundant and unused local vars