Cleanup prepare/commit reserve size calculation
v2.25.1.0