Removed some more unused variables