Reporting rates cleanup