More cleanning in Efficiency and Rate Analyzers