removed some superfluous computation