removing cruft looks like there is only one place where to use that bigint stuff