Removed some unused variables