Remove is_infinite