Removed a couple of unused variables