Integer type cleanup