first round of xpatharticleenhancer cleanup