Some cleanup, handle a special case (delete, reference conflict)