Removed some more unused local vars