Fix orpan removal, validation.