MDL-40549 remove last traces of oacleanup

Thanks Marina!