Add clone removal.
Adapt to mgo changes.