Removed some unecessary variables.