small simplifications, but still no root cause for slowdown on 5k data points