Removed some unnecessary variables.