Vague cleaning up of Ndiv