Removed more unecessary variables.