Removed the two todos regarding the speed-math.