Reporting cleanup