Remove BigInt, improve performance