Remove remaining refs to onDuplicate