More cleanning in Efficiency analyzer