Removed couple of unused variables