Remove some unnecessary calculations

Much (a factor of ~20) faster than before