Cleanup integer types