Removed superflous computations, these are done later again.