Remove NatCmp since it's in the library