Remove references to OwningPtr