Ah, I misunderstood and thought clone and equals were the only two that should remain.  Will remove.