Removed some superfluous variables.